@chevre/domain 21.2.0-alpha.34 → 21.2.0-alpha.36

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

@@ -6,8 +6,10 @@ import { chevre } from '../../../../lib/index';
 const EXCLUDED_PROJECT_ID = process.env.EXCLUDED_PROJECT_ID;
 const AGGREGATE_DAYS = Number(process.env.AGGREGATE_DAYS);
 const AGGREGATE_CLIENT_IDS = (typeof process.env.AGGREGATE_CLIENT_IDS === 'string') ? process.env.AGGREGATE_CLIENT_IDS.split(' ') : [];
+const ONE_DAY_IN_HOURS = 24;
 console.log('AGGREGATE_CLIENT_IDS:', AGGREGATE_CLIENT_IDS);
 
+// tslint:disable-next-line:max-func-body-length
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
@@ -18,94 +20,119 @@ async function main() {
     const actionRepo = new chevre.repository.Action(mongoose.connection);
     const taskRepo = new chevre.repository.Task(mongoose.connection);
 
-    await chevre.service.aggregation.system.aggregatePayMovieTicketAction({
-        aggregationDays: AGGREGATE_DAYS,
-        excludedProjectId: EXCLUDED_PROJECT_ID
+    let result: { aggregationCount: number; aggregateDuration: string };
+
+    result = await chevre.service.aggregation.system.aggregatePlaceOrder({
+        aggregateDurationUnit: 'hours',
+        aggregationCount: AGGREGATE_DAYS * ONE_DAY_IN_HOURS,
+        excludedProjectId: EXCLUDED_PROJECT_ID,
+        clientIds: AGGREGATE_CLIENT_IDS
     })({
         agregation: aggregationRepo,
-        action: actionRepo
+        transaction: transactionRepo
     });
+    console.log('aggregatePlaceOrder processed.', result);
+    // return;
 
-    await chevre.service.aggregation.system.aggregatePayTransaction({
-        aggregationDays: AGGREGATE_DAYS,
+    result = await chevre.service.aggregation.system.aggregateTask({
+        aggregateDurationUnit: 'hours',
+        aggregationCount: AGGREGATE_DAYS * ONE_DAY_IN_HOURS,
         excludedProjectId: EXCLUDED_PROJECT_ID
     })({
         agregation: aggregationRepo,
-        assetTransaction: assetTransactionRepo
+        task: taskRepo
     });
+    console.log('aggregateTask processed.', result);
 
-    await chevre.service.aggregation.system.aggregateEvent({
-        aggregationDays: AGGREGATE_DAYS,
+    result = await chevre.service.aggregation.system.aggregatePayMovieTicketAction({
+        aggregateDurationUnit: 'hours',
+        aggregationCount: AGGREGATE_DAYS * ONE_DAY_IN_HOURS,
         excludedProjectId: EXCLUDED_PROJECT_ID
     })({
         agregation: aggregationRepo,
-        event: eventRepo
+        action: actionRepo
     });
+    console.log('aggregatePayMovieTicketAction processed.', result);
 
-    await chevre.service.aggregation.system.aggregateTask({
-        aggregationDays: AGGREGATE_DAYS,
+    result = await chevre.service.aggregation.system.aggregatePayTransaction({
+        aggregateDurationUnit: 'hours',
+        aggregationCount: AGGREGATE_DAYS * ONE_DAY_IN_HOURS,
         excludedProjectId: EXCLUDED_PROJECT_ID
     })({
         agregation: aggregationRepo,
-        task: taskRepo
+        assetTransaction: assetTransactionRepo
     });
+    console.log('aggregatePayTransaction processed.', result);
 
-    await chevre.service.aggregation.system.aggregateReserveTransaction({
-        aggregationDays: AGGREGATE_DAYS,
+    result = await chevre.service.aggregation.system.aggregateEvent({
+        aggregateDurationUnit: 'hours',
+        aggregationCount: AGGREGATE_DAYS * ONE_DAY_IN_HOURS,
         excludedProjectId: EXCLUDED_PROJECT_ID
     })({
         agregation: aggregationRepo,
-        assetTransaction: assetTransactionRepo
+        event: eventRepo
     });
+    console.log('aggregateEvent processed.', result);
 
-    await chevre.service.aggregation.system.aggregatePlaceOrder({
-        aggregationDays: AGGREGATE_DAYS,
-        excludedProjectId: EXCLUDED_PROJECT_ID,
-        clientIds: AGGREGATE_CLIENT_IDS
+    result = await chevre.service.aggregation.system.aggregateReserveTransaction({
+        aggregateDurationUnit: 'hours',
+        aggregationCount: AGGREGATE_DAYS * ONE_DAY_IN_HOURS,
+        excludedProjectId: EXCLUDED_PROJECT_ID
     })({
         agregation: aggregationRepo,
-        transaction: transactionRepo
+        assetTransaction: assetTransactionRepo
     });
+    console.log('aggregateReserveTransaction processed.', result);
 
-    await chevre.service.aggregation.system.aggregateAuthorizeOrderAction({
-        aggregationDays: AGGREGATE_DAYS,
+    result = await chevre.service.aggregation.system.aggregateAuthorizeOrderAction({
+        aggregateDurationUnit: 'hours',
+        aggregationCount: AGGREGATE_DAYS * ONE_DAY_IN_HOURS,
         excludedProjectId: EXCLUDED_PROJECT_ID
     })({
         agregation: aggregationRepo,
         action: actionRepo
     });
+    console.log('aggregateAuthorizeOrderAction processed.', result);
 
-    await chevre.service.aggregation.system.aggregateAuthorizeEventServiceOfferAction({
-        aggregationDays: AGGREGATE_DAYS,
+    result = await chevre.service.aggregation.system.aggregateAuthorizeEventServiceOfferAction({
+        aggregateDurationUnit: 'hours',
+        aggregationCount: AGGREGATE_DAYS * ONE_DAY_IN_HOURS,
         excludedProjectId: EXCLUDED_PROJECT_ID
     })({
         agregation: aggregationRepo,
         action: actionRepo
     });
+    console.log('aggregateAuthorizeEventServiceOfferAction processed.', result);
 
-    await chevre.service.aggregation.system.aggregateAuthorizePaymentAction({
-        aggregationDays: AGGREGATE_DAYS,
+    result = await chevre.service.aggregation.system.aggregateAuthorizePaymentAction({
+        aggregateDurationUnit: 'hours',
+        aggregationCount: AGGREGATE_DAYS * ONE_DAY_IN_HOURS,
         excludedProjectId: EXCLUDED_PROJECT_ID
     })({
         agregation: aggregationRepo,
         action: actionRepo
     });
+    console.log('aggregateAuthorizePaymentAction processed.', result);
 
-    await chevre.service.aggregation.system.aggregateUseAction({
-        aggregationDays: AGGREGATE_DAYS,
+    result = await chevre.service.aggregation.system.aggregateUseAction({
+        aggregateDurationUnit: 'hours',
+        aggregationCount: AGGREGATE_DAYS * ONE_DAY_IN_HOURS,
         excludedProjectId: EXCLUDED_PROJECT_ID
     })({
         agregation: aggregationRepo,
         action: actionRepo
     });
+    console.log('aggregateUseAction processed.', result);
 
-    await chevre.service.aggregation.system.aggregateCheckMovieTicketAction({
-        aggregationDays: AGGREGATE_DAYS,
+    result = await chevre.service.aggregation.system.aggregateCheckMovieTicketAction({
+        aggregateDurationUnit: 'hours',
+        aggregationCount: AGGREGATE_DAYS * ONE_DAY_IN_HOURS,
         excludedProjectId: EXCLUDED_PROJECT_ID
     })({
         agregation: aggregationRepo,
         action: actionRepo
     });
+    console.log('aggregateCheckMovieTicketAction processed.', result);
 }
 
 main()

package/example/src/chevre/task/executeTasks.ts

@@ -0,0 +1,26 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../../lib/index';
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const taskRepo = new chevre.repository.Task(mongoose.connection);
+    const result = await taskRepo.executeTasks({
+        now: new Date(),
+        delayInSeconds: 60,
+        limit: 1,
+        name: {
+            $nin: [
+                chevre.factory.taskName.ImportEventCapacitiesFromCOA,
+                chevre.factory.taskName.ImportEventsFromCOA
+            ]
+        }
+    });
+    console.log(result);
+}
+
+main()
+    .then(console.log)
+    .catch(console.error);

package/lib/chevre/repo/assetTransaction.js

@@ -351,10 +351,17 @@ class MongoRepository {
      */
     startAndConfirm(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.transactionModel.create(Object.assign(Object.assign({}, params), { _id: params.id, typeOf: params.typeOf, startDate: new Date(), status: factory.transactionStatusType.Confirmed, tasksExportAction: {
+            const startDate = new Date();
+            const confirmedTransaction = yield this.transactionModel.create(Object.assign(Object.assign({}, params), { _id: params.id, typeOf: params.typeOf, startDate, status: factory.transactionStatusType.Confirmed, tasksExportAction: {
                     actionStatus: factory.actionStatusType.PotentialActionStatus
-                }, tasksExportationStatus: factory.transactionTasksExportationStatus.Unexported, endDate: new Date(), result: params.result, potentialActions: params.potentialActions }))
+                }, tasksExportationStatus: factory.transactionTasksExportationStatus.Unexported, endDate: startDate, result: params.result, potentialActions: params.potentialActions }))
                 .then((doc) => doc.toObject());
+            assetTransaction_2.assetTransactionEventEmitter.emitAssetTransactionStatusChanged({
+                id: params.id,
+                typeOf: params.typeOf,
+                status: factory.transactionStatusType.Confirmed
+            });
+            return confirmedTransaction;
         });
     }
     /**

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

@@ -43,6 +43,17 @@ export declare class MongoRepository {
             name: string;
         };
     }): Promise<factory.task.ITask<T> | null>;
+    /**
+     * 一定期間遅延したタスクを実行する
+     */
+    executeTasks(params: {
+        now: Date;
+        delayInSeconds: number;
+        limit: number;
+        name: {
+            $nin?: factory.taskName[];
+        };
+    }): Promise<Pick<import("@chevre/factory/lib/task").ITask | import("@chevre/factory/lib/task/deleteAssetTransaction").ITask | import("@chevre/factory/lib/task/deleteOrder").ITask | import("@chevre/factory/lib/task/deleteTransaction").ITask | import("@chevre/factory/lib/task/sendEmailMessage").ITask | import("@chevre/factory/lib/task/triggerWebhook").ITask | import("@chevre/factory/lib/task/confirmMoneyTransfer").ITask | import("@chevre/factory/lib/task/confirmRegisterService").ITask | import("@chevre/factory/lib/task/confirmPayTransaction").ITask | import("@chevre/factory/lib/task/confirmRegisterServiceTransaction").ITask | import("@chevre/factory/lib/task/confirmReserveTransaction").ITask | import("@chevre/factory/lib/task/deleteMember").ITask | import("@chevre/factory/lib/task/givePointAward").ITask | import("@chevre/factory/lib/task/orderProgramMembership").ITask | import("@chevre/factory/lib/task/placeOrder").ITask | import("@chevre/factory/lib/task/returnOrder").ITask | import("@chevre/factory/lib/task/returnMoneyTransfer").ITask | import("@chevre/factory/lib/task/returnPayTransaction").ITask | import("@chevre/factory/lib/task/returnPointAward").ITask | import("@chevre/factory/lib/task/returnReserveTransaction").ITask | import("@chevre/factory/lib/task/sendOrder").ITask | import("@chevre/factory/lib/task/voidMoneyTransferTransaction").ITask | import("@chevre/factory/lib/task/voidPayTransaction").ITask | import("@chevre/factory/lib/task/voidRegisterServiceTransaction").ITask | import("@chevre/factory/lib/task/voidReserveTransaction").ITask, "name" | "id" | "status">[]>;
     retry(params: {
         intervalInMinutes: number;
     }): Promise<void>;

package/lib/chevre/repo/task.js

@@ -246,6 +246,35 @@ class MongoRepository {
             return doc.toObject();
         });
     }
+    /**
+     * 一定期間遅延したタスクを実行する
+     */
+    executeTasks(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const runsAtLt = moment(params.now)
+                .add(-params.delayInSeconds, 'seconds')
+                .toDate();
+            const delayedTasks = yield this.taskModel.find(Object.assign({ status: { $eq: factory.taskStatus.Ready }, runsAt: { $lt: runsAtLt } }, (Array.isArray(params.name.$nin)) ? { name: { $nin: params.name.$nin } } : undefined))
+                .select({
+                _id: 1,
+                name: 1,
+                status: 1
+            })
+                .limit(params.limit)
+                .setOptions({ maxTimeMS: 10000 })
+                .exec();
+            if (delayedTasks.length > 0) {
+                delayedTasks.forEach((delayedTask) => {
+                    task_2.taskEventEmitter.emitTaskStatusChanged({
+                        id: delayedTask.id,
+                        name: delayedTask.name,
+                        status: delayedTask.status
+                    });
+                });
+            }
+            return delayedTasks;
+        });
+    }
     retry(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const lastTriedAtShoudBeLessThan = moment()

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

@@ -4,97 +4,142 @@ import { MongoRepository as AssetTransactionRepo } from '../../repo/assetTransac
 import { MongoRepository as EventRepo } from '../../repo/event';
 import { MongoRepository as TasKRepo } from '../../repo/task';
 import { MongoRepository as TransactionRepo } from '../../repo/transaction';
+type AggregateDurationUnit = 'days' | 'hours';
 declare function aggregateEvent(params: {
-    aggregationDays: number;
+    aggregateDurationUnit: AggregateDurationUnit;
+    aggregationCount: number;
     excludedProjectId?: string;
 }): (repos: {
     agregation: AggregationRepo;
     event: EventRepo;
-}) => Promise<void>;
+}) => Promise<{
+    aggregationCount: number;
+    aggregateDuration: string;
+}>;
 /**
  * 注文取引集計
  */
 declare function aggregatePlaceOrder(params: {
-    aggregationDays: number;
+    aggregateDurationUnit: AggregateDurationUnit;
+    aggregationCount: number;
     excludedProjectId?: string;
     clientIds?: string[];
 }): (repos: {
     agregation: AggregationRepo;
     transaction: TransactionRepo;
-}) => Promise<void>;
+}) => Promise<{
+    aggregationCount: number;
+    aggregateDuration: string;
+}>;
 /**
  * 興行オファー承認アクション集計
  */
 declare function aggregateAuthorizeEventServiceOfferAction(params: {
-    aggregationDays: number;
+    aggregateDurationUnit: AggregateDurationUnit;
+    aggregationCount: number;
     excludedProjectId?: string;
 }): (repos: {
     agregation: AggregationRepo;
     action: ActionRepo;
-}) => Promise<void>;
+}) => Promise<{
+    aggregationCount: number;
+    aggregateDuration: string;
+}>;
 /**
  * 決済承認アクション集計
  */
 declare function aggregateAuthorizePaymentAction(params: {
-    aggregationDays: number;
+    aggregateDurationUnit: AggregateDurationUnit;
+    aggregationCount: number;
     excludedProjectId?: string;
 }): (repos: {
     agregation: AggregationRepo;
     action: ActionRepo;
-}) => Promise<void>;
+}) => Promise<{
+    aggregationCount: number;
+    aggregateDuration: string;
+}>;
 declare function aggregateAuthorizeOrderAction(params: {
-    aggregationDays: number;
+    aggregateDurationUnit: AggregateDurationUnit;
+    aggregationCount: number;
     excludedProjectId?: string;
 }): (repos: {
     agregation: AggregationRepo;
     action: ActionRepo;
-}) => Promise<void>;
+}) => Promise<{
+    aggregationCount: number;
+    aggregateDuration: string;
+}>;
 /**
  * 使用アクション集計
  */
 declare function aggregateUseAction(params: {
-    aggregationDays: number;
+    aggregateDurationUnit: AggregateDurationUnit;
+    aggregationCount: number;
     excludedProjectId?: string;
 }): (repos: {
     agregation: AggregationRepo;
     action: ActionRepo;
-}) => Promise<void>;
+}) => Promise<{
+    aggregationCount: number;
+    aggregateDuration: string;
+}>;
 declare function aggregateCheckMovieTicketAction(params: {
-    aggregationDays: number;
+    aggregateDurationUnit: AggregateDurationUnit;
+    aggregationCount: number;
     excludedProjectId?: string;
 }): (repos: {
     agregation: AggregationRepo;
     action: ActionRepo;
-}) => Promise<void>;
+}) => Promise<{
+    aggregationCount: number;
+    aggregateDuration: string;
+}>;
 declare function aggregatePayMovieTicketAction(params: {
-    aggregationDays: number;
+    aggregateDurationUnit: AggregateDurationUnit;
+    aggregationCount: number;
     excludedProjectId?: string;
 }): (repos: {
     agregation: AggregationRepo;
     action: ActionRepo;
-}) => Promise<void>;
+}) => Promise<{
+    aggregationCount: number;
+    aggregateDuration: string;
+}>;
 declare function aggregatePayTransaction(params: {
-    aggregationDays: number;
+    aggregateDurationUnit: AggregateDurationUnit;
+    aggregationCount: number;
     excludedProjectId?: string;
 }): (repos: {
     agregation: AggregationRepo;
     assetTransaction: AssetTransactionRepo;
-}) => Promise<void>;
+}) => Promise<{
+    aggregationCount: number;
+    aggregateDuration: string;
+}>;
 /**
  * 予約集計
  */
 declare function aggregateReserveTransaction(params: {
-    aggregationDays: number;
+    aggregateDurationUnit: AggregateDurationUnit;
+    aggregationCount: number;
     excludedProjectId?: string;
 }): (repos: {
     agregation: AggregationRepo;
     assetTransaction: AssetTransactionRepo;
-}) => Promise<void>;
+}) => Promise<{
+    aggregationCount: number;
+    aggregateDuration: string;
+}>;
 declare function aggregateTask(params: {
-    aggregationDays: number;
+    aggregateDurationUnit: AggregateDurationUnit;
+    aggregationCount: number;
     excludedProjectId?: string;
 }): (repos: {
     agregation: AggregationRepo;
     task: TasKRepo;
-}) => Promise<void>;
+}) => Promise<{
+    aggregationCount: number;
+    aggregateDuration: string;
+}>;
 export { aggregateAuthorizeEventServiceOfferAction, aggregateAuthorizeOrderAction, aggregateAuthorizePaymentAction, aggregateCheckMovieTicketAction, aggregateEvent, aggregatePayMovieTicketAction, aggregatePayTransaction, aggregatePlaceOrder, aggregateReserveTransaction, aggregateTask, aggregateUseAction };

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

@@ -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,22 +218,22 @@ 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({
                 project: { id: { $ne: params.excludedProjectId } },
@@ -239,6 +244,7 @@ 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;
@@ -246,22 +252,22 @@ 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 +277,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 +285,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 +310,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 +318,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 +344,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 +355,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 +381,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 +389,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/transaction/placeOrder/exportTasks/factory.js

@@ -92,7 +92,21 @@ function createTasks(params) {
             purpose: { typeOf: transaction.typeOf, id: transaction.id }
         }
     };
-    taskAttributes.push(...triggerWebhookTaskAttributes, deleteTransactionTask, voidPaymentTaskAttributes);
+    // 確定取引にも興行オファー承認中止タスクを追加(2023-05-09~)
+    const voidReserveTaskAttributes = {
+        project: transaction.project,
+        name: factory.taskName.VoidReserveTransaction,
+        status: factory.taskStatus.Ready,
+        runsAt: taskRunsAt,
+        remainingNumberOfTries: 10,
+        numberOfTried: 0,
+        executionResults: [],
+        data: {
+            project: transaction.project,
+            purpose: { typeOf: transaction.typeOf, id: transaction.id }
+        }
+    };
+    taskAttributes.push(...triggerWebhookTaskAttributes, deleteTransactionTask, voidPaymentTaskAttributes, voidReserveTaskAttributes);
     switch (transaction.status) {
         case factory.transactionStatusType.Confirmed:
             const potentialActions = transaction.potentialActions;
@@ -123,19 +137,6 @@ function createTasks(params) {
             break;
         case factory.transactionStatusType.Canceled:
         case factory.transactionStatusType.Expired:
-            const voidReserveTaskAttributes = {
-                project: transaction.project,
-                name: factory.taskName.VoidReserveTransaction,
-                status: factory.taskStatus.Ready,
-                runsAt: taskRunsAt,
-                remainingNumberOfTries: 10,
-                numberOfTried: 0,
-                executionResults: [],
-                data: {
-                    project: transaction.project,
-                    purpose: { typeOf: transaction.typeOf, id: transaction.id }
-                }
-            };
             const voidRegisterServiceTaskAttributes = {
                 project: transaction.project,
                 name: factory.taskName.VoidRegisterServiceTransaction,
@@ -162,7 +163,7 @@ function createTasks(params) {
                     purpose: { typeOf: transaction.typeOf, id: transaction.id }
                 }
             };
-            taskAttributes.push(voidReserveTaskAttributes, voidRegisterServiceTaskAttributes, voidMoneyTransferTaskAttributes);
+            taskAttributes.push(voidRegisterServiceTaskAttributes, voidMoneyTransferTaskAttributes);
             break;
         default:
             throw new factory.errors.NotImplemented(`Transaction status "${transaction.status}" not implemented.`);

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