@chevre/domain 22.11.0-alpha.28 → 22.11.0-alpha.29

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

@@ -0,0 +1,41 @@
+// tslint:disable:no-console
+import * as moment from 'moment';
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../../lib/index';
+
+// tslint:disable-next-line:max-func-body-length
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const taskRepo = await chevre.repository.Task.createInstance(mongoose.connection);
+
+    const aggregateDate = new Date();
+    const runsFrom: Date = moment(aggregateDate)
+        .utc()
+        // .tz('Asia/Tokyo')
+        .add(-1, 'days')
+        .startOf('days')
+        .toDate();
+    const runsThrough: Date = moment(aggregateDate)
+        .utc()
+        // .tz('Asia/Tokyo')
+        .add(-1, 'days')
+        .endOf('days')
+        .toDate();
+
+    const result = await taskRepo.aggregateTask({
+        project: {
+            id: { $ne: 'sskts-development' }
+        },
+        runsFrom,
+        runsThrough
+    });
+    console.dir(result, { depth: null });
+}
+
+main()
+    .then(() => {
+        console.log('success!');
+    })
+    .catch(console.error);

package/example/src/chevre/settings/addSettings.ts

@@ -25,7 +25,15 @@ async function main() {
                     }
                 }],
                 informTaskNames: [
-                    chevre.factory.taskName.Pay
+                    chevre.factory.taskName.Pay,
+                    chevre.factory.taskName.InvalidatePaymentUrl,
+                    chevre.factory.taskName.Refund,
+                    chevre.factory.taskName.VoidPayment
+                    // chevre.factory.taskName.ConfirmReserveTransaction
+                ],
+                informTaskStatuses: [
+                    chevre.factory.taskStatus.Aborted
+                    // chevre.factory.taskStatus.Running
                 ]
             }
         }

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

@@ -20,29 +20,43 @@ interface IReadyTask {
     expires?: Date;
     executionResult?: never;
 }
+/**
+ * タスク名不明の遅延実行中タスク
+ */
 interface IRunningTask {
     id: string;
     status: factory.taskStatus.Running;
-    remainingNumberOfTries?: never;
     name?: never;
+    remainingNumberOfTries?: never;
     expires?: never;
     executionResult?: never;
 }
 /**
- * 実行されたタスクイベント
+ * タスク名指定での遅延実行中タスク
+ */
+interface IRunningTaskByName {
+    id: string;
+    status: factory.taskStatus.Running;
+    name: factory.taskName;
+    remainingNumberOfTries?: never;
+    expires?: never;
+    executionResult?: never;
+}
+/**
+ * 実行後失敗したタスクイベント
  */
 interface IExecutedTask {
     id: string;
-    status: factory.taskStatus.Executed | factory.taskStatus.Running | factory.taskStatus.Aborted;
+    status: factory.taskStatus.Running | factory.taskStatus.Aborted;
+    name: factory.taskName;
     executionResult: factory.task.IExecutionResult;
     /**
      * 実行されたタスクの残り試行回数
      */
     remainingNumberOfTries: number;
-    name: factory.taskName;
     expires?: never;
 }
-type IChangedTask = IReadyTask | IRunningTask | IExecutedTask;
+type IChangedTask = IReadyTask | IRunningTask | IRunningTaskByName | IExecutedTask;
 type IOperationExecute<T> = (settings: IExecuteSettings) => Promise<T>;
 type INextFunction = (task: IExecutedTask) => IOperationExecute<void>;
 type IOnTaskStatusChangedListener = (task: IChangedTask, next?: INextFunction) => void;
@@ -54,4 +68,4 @@ declare class TaskEventEmitter extends EventEmitter {
     emitTaskStatusChanged(task: IChangedTask, next?: INextFunction): void;
 }
 declare const taskEventEmitter: TaskEventEmitter;
-export { IChangedTask, IReadyTask, IRunningTask, IExecutedTask, IExecuteSettings, INextFunction, IOnTaskStatusChangedListener, taskEventEmitter };
+export { IChangedTask, IReadyTask, IRunningTask, IRunningTaskByName, IExecutedTask, IExecuteSettings, INextFunction, IOnTaskStatusChangedListener, taskEventEmitter };

package/lib/chevre/repo/task.js

@@ -496,10 +496,21 @@ class TaskRepo {
                 // tslint:disable-next-line:no-null-keyword
                 return null;
             }
-            task_1.taskEventEmitter.emitTaskStatusChanged({
-                id: doc.id,
-                status: factory.taskStatus.Running
-            }, (typeof next === 'function') ? next : undefined);
+            let changedTask;
+            if (typeof nameEq === 'string') {
+                changedTask = {
+                    id: doc.id,
+                    status: factory.taskStatus.Running,
+                    name: nameEq
+                };
+            }
+            else {
+                changedTask = {
+                    id: doc.id,
+                    status: factory.taskStatus.Running
+                };
+            }
+            task_1.taskEventEmitter.emitTaskStatusChanged(changedTask, (typeof next === 'function') ? next : undefined);
             return doc;
         });
     }
@@ -639,8 +650,10 @@ class TaskRepo {
                 .exec();
             // emit event(2025-05-26~)
             if (typeof next === 'function') {
-                const changedTask = { id, name, status, remainingNumberOfTries, executionResult };
-                task_1.taskEventEmitter.emitTaskStatusChanged(changedTask, next);
+                if (status !== factory.taskStatus.Executed) {
+                    const changedTask = { id, name, status, remainingNumberOfTries, executionResult };
+                    task_1.taskEventEmitter.emitTaskStatusChanged(changedTask, next);
+                }
             }
         });
     }
@@ -762,10 +775,10 @@ class TaskRepo {
                 factory.taskStatus.Aborted
             ].map((taskStatus) => __awaiter(this, void 0, void 0, function* () {
                 var _a, _b;
-                const matchConditions = Object.assign({ runsAt: {
+                const matchConditions = Object.assign({ status: { $eq: taskStatus }, runsAt: {
                         $gte: params.runsFrom,
                         $lte: params.runsThrough
-                    }, status: { $eq: taskStatus } }, (typeof ((_b = (_a = params.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$ne) === 'string')
+                    } }, (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, status: taskStatus });
@@ -778,7 +791,7 @@ class TaskRepo {
         return __awaiter(this, void 0, void 0, function* () {
             const matchConditions = params.matchConditions;
             const taskStatus = params.status;
-            const aggregations = yield this.taskModel.aggregate([
+            const aggregate1 = this.taskModel.aggregate([
                 {
                     $match: matchConditions
                 },
@@ -808,8 +821,11 @@ class TaskRepo {
                         minLatency: '$minLatency'
                     }
                 }
-            ])
-                .exec();
+            ]);
+            // const explainResult = await aggregate1.explain();
+            // console.dir(explainResult, { depth: null });
+            // return;
+            const aggregations = yield aggregate1.exec();
             // tslint:disable-next-line:no-magic-numbers
             const percents = [50, 95, 99];
             if (aggregations.length === 0) {
@@ -836,7 +852,7 @@ class TaskRepo {
                     rank: Math.floor(aggregations[0].taskCount * percentile / 100)
                 };
             });
-            const aggregations2 = yield this.taskModel.aggregate([
+            const aggregate2 = this.taskModel.aggregate([
                 {
                     $match: matchConditions
                 },
@@ -866,8 +882,8 @@ class TaskRepo {
                         })
                     }
                 }
-            ])
-                .exec();
+            ]);
+            const aggregations2 = yield aggregate2.exec();
             return {
                 status: taskStatus,
                 aggregation: Object.assign(Object.assign({}, aggregations[0]), aggregations2[0])

package/lib/chevre/repo/transaction.js

@@ -323,7 +323,7 @@ class TransactionRepo {
                 .lean() // 2024-08-26~
                 .exec();
             if (doc === null) {
-                throw new factory.errors.NotFound(this.transactionModel.modelName);
+                throw new factory.errors.NotFound(this.transactionModel.modelName, `${params.typeOf} not found`);
             }
             return doc;
         });
@@ -371,7 +371,7 @@ class TransactionRepo {
                 .lean() // 2024-08-26~
                 .exec();
             if (doc === null) {
-                throw new factory.errors.NotFound(this.transactionModel.modelName);
+                throw new factory.errors.NotFound(this.transactionModel.modelName, `${params.typeOf} ${factory.transactionStatusType.InProgress} not found`);
             }
             return doc;
         });
@@ -389,7 +389,7 @@ class TransactionRepo {
                 .lean() // 2024-08-26~
                 .exec();
             if (doc === null) {
-                throw new factory.errors.NotFound(this.transactionModel.modelName);
+                throw new factory.errors.NotFound(this.transactionModel.modelName, `${factory.transactionType.PlaceOrder} ${factory.transactionStatusType.InProgress} not found`);
             }
             return doc.object.paymentMethods;
         });
@@ -407,7 +407,7 @@ class TransactionRepo {
                 .lean() // 2024-08-26~
                 .exec();
             if (doc === null) {
-                throw new factory.errors.NotFound(this.transactionModel.modelName);
+                throw new factory.errors.NotFound(this.transactionModel.modelName, `${factory.transactionType.PlaceOrder} ${factory.transactionStatusType.InProgress} not found`);
             }
             return doc.object.orderNumber;
         });
@@ -425,7 +425,7 @@ class TransactionRepo {
                 .lean() // 2024-08-26~
                 .exec();
             if (doc === null) {
-                throw new factory.errors.NotFound(this.transactionModel.modelName);
+                throw new factory.errors.NotFound(this.transactionModel.modelName, `${factory.transactionType.PlaceOrder} ${params.status.$in.join(' or ')} not found`);
             }
             return doc.object.confirmationNumber;
         });
@@ -448,7 +448,7 @@ class TransactionRepo {
                 .lean()
                 .exec();
             if (doc === null) {
-                throw new factory.errors.NotFound(this.transactionModel.modelName);
+                throw new factory.errors.NotFound(this.transactionModel.modelName, `${params.typeOf} ${factory.transactionStatusType.InProgress} not found`);
             }
         });
     }
@@ -471,7 +471,7 @@ class TransactionRepo {
                 .lean()
                 .exec();
             if (doc === null) {
-                throw new factory.errors.NotFound(this.transactionModel.modelName);
+                throw new factory.errors.NotFound(this.transactionModel.modelName, `${params.typeOf} ${factory.transactionStatusType.InProgress} not found`);
             }
         });
     }
@@ -494,7 +494,7 @@ class TransactionRepo {
                 .lean()
                 .exec();
             if (doc === null) {
-                throw new factory.errors.NotFound(this.transactionModel.modelName);
+                throw new factory.errors.NotFound(this.transactionModel.modelName, `${params.typeOf} ${factory.transactionStatusType.InProgress} not found`);
             }
         });
     }
@@ -538,7 +538,7 @@ class TransactionRepo {
                         .isSameOrBefore(moment(endDate))) {
                         throw new factory.errors.Argument('Transaction id', 'potentially expired');
                     }
-                    throw new factory.errors.NotFound(this.transactionModel.modelName);
+                    throw new factory.errors.NotFound(this.transactionModel.modelName, `${params.typeOf} ${factory.transactionStatusType.InProgress} not found`);
                 }
             }
             transaction_1.transactionEventEmitter.emitTransactionStatusChanged({
@@ -914,7 +914,7 @@ class TransactionRepo {
                     throw new factory.errors.Argument('Transaction id', 'Confirmed transaction unable to cancel');
                 }
                 else {
-                    throw new factory.errors.NotFound(this.transactionModel.modelName);
+                    throw new factory.errors.NotFound(this.transactionModel.modelName, `${params.typeOf} ${factory.transactionStatusType.InProgress} not found`);
                 }
             }
             transaction_1.transactionEventEmitter.emitTransactionStatusChanged({

package/package.json

@@ -115,5 +115,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.11.0-alpha.28"
+  "version": "22.11.0-alpha.29"
 }