@chevre/domain 22.11.0-alpha.30 → 22.11.0-alpha.32

package/example/src/chevre/checkCustomerAttributesLength.ts

@@ -0,0 +1,109 @@
+// tslint:disable:no-console
+import * as moment from 'moment';
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+// const project = { id: String(process.env.PROJECT_ID) };
+const MAX_LENGTH = 50;
+const CHECK_DAYS = 60;
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const orderRepo = await chevre.repository.Order.createInstance(mongoose.connection);
+
+    const cursor = orderRepo.getCursor(
+        {
+            typeOf: { $eq: chevre.factory.order.OrderType.Order },
+            orderDate: {
+                $gte: moment()
+                    .add(-CHECK_DAYS, 'days')
+                    .toDate()
+            }
+            // _id: { $eq: '67de46777ec0510590b68922' }
+        },
+        {
+            customer: 1,
+            project: 1,
+            orderDate: 1
+        }
+    );
+    console.log('docs found');
+
+    let i = 0;
+    let exceededCount = 0;
+    await cursor.eachAsync(async (doc) => {
+        i += 1;
+        const order: Pick<
+            chevre.factory.order.IOrder,
+            'customer' | 'project' | 'orderDate'
+        > = doc.toObject();
+
+        const attributesNames: (keyof chevre.factory.order.ICustomer)[] = [
+            'address',
+            'age',
+            'email',
+            'givenName',
+            'familyName',
+            'gender',
+            'name',
+            'url',
+            'telephone'
+        ];
+
+        const maxLengthNotExceeded = attributesNames.every((attributesName) => {
+            const attributesValue = order.customer[attributesName];
+            if (attributesValue === undefined) {
+                return true;
+            }
+            if (typeof attributesValue !== 'string') {
+                throw new Error(`${attributesName}: ${attributesValue} must be string. ${order.project.id}`);
+            }
+
+            return attributesValue.length <= MAX_LENGTH;
+        });
+
+        if (maxLengthNotExceeded) {
+            // no op
+            process.stdout.write('-');
+        } else {
+            exceededCount += 1;
+            console.log('\n');
+            console.log('maxLengthExceeded.', order.project.id, order.customer, order.orderDate, i);
+        }
+    });
+
+    console.log('\n');
+    console.log(i, 'docs checked');
+    console.log(exceededCount, 'docs exceeded');
+
+    // let result: any;
+    // const attributesNames = [
+    //     // 'customer.address',
+    //     // 'customer.age',
+    //     'customer.email',
+    //     'customer.givenName',
+    //     'customer.familyName'
+    //     // 'customer.gender',
+    //     // 'customer.name',
+    //     // 'customer.url',
+    // ];
+    // for (const attributesName of attributesNames) {
+    //     console.log('how is', attributesName, '?');
+    //     result = await orderRepo.checkCustomerAttributesLength({
+    //         attributesName,
+    //         length: MAX_LENGTH
+    //     });
+    //     // tslint:disable-next-line:no-null-keyword
+    //     console.dir(result, { depth: null });
+    //     console.log('how is', attributesName, '?', result.length, 'results found');
+    // }
+}
+
+main()
+    .then(() => {
+        console.log('\n');
+        console.log('success!');
+    })
+    .catch(console.error);

package/example/src/chevre/{deleteRunsAtPassedCertainPeriod.ts → task/deleteRunsAtPassedCertainPeriod.ts}

@@ -2,9 +2,10 @@
 import * as moment from 'moment';
 import * as mongoose from 'mongoose';
 
-import { chevre } from '../../../lib/index';
+import { chevre } from '../../../../lib/index';
 
-const TASK_STORAGE_PERIOD_IN_MINUTES = 43200; // 30*24*60
+// const TASK_STORAGE_PERIOD_IN_MINUTES = 43200; // 30*24*60
+const TASK_STORAGE_PERIOD_IN_MINUTES = 28800; // 20*24*60
 
 async function main() {
     const now = new Date();
@@ -12,7 +13,7 @@ async function main() {
 
     const taskRepo = await chevre.repository.Task.createInstance(mongoose.connection);
 
-    let taskInMinutes = 57600; // 40*24*60
+    let taskInMinutes = 44640; // 31*24*60
     // let taskInMinutes = 172800; // 120*24*60
     // tslint:disable-next-line:no-magic-numbers
     while (taskInMinutes > TASK_STORAGE_PERIOD_IN_MINUTES) {

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

@@ -0,0 +1,23 @@
+// 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 = await chevre.repository.Task.createInstance(mongoose.connection);
+    const result = await taskRepo.taskModel.deleteMany({
+        $or: [
+            { name: { $exists: false } },
+            { status: { $exists: false } }
+        ]
+    })
+        .exec();
+
+    console.log('success!', result);
+}
+
+main()
+    .then()
+    .catch(console.error);

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

@@ -43,11 +43,11 @@ interface IRunningTaskByName {
     executionResult?: never;
 }
 /**
- * 実行後失敗したタスクイベント
+ * 実行後タスクイベント
  */
 interface IExecutedTask {
     id: string;
-    status: factory.taskStatus.Running | factory.taskStatus.Aborted;
+    status: factory.taskStatus.Executed | factory.taskStatus.Running | factory.taskStatus.Aborted;
     name: factory.taskName;
     executionResult: factory.task.IExecutionResult;
     /**

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

@@ -119,12 +119,15 @@ export declare class TaskRepo {
      * 実行日時を一定期間過ぎたReadyタスクについて、Runningスタータスに変更した上で、Runningイベントを発生させる
      */
     emitRunningIfExists(params: {
-        name?: {
-            $eq?: factory.taskName;
-            $in?: factory.taskName[];
-        };
-        executor: {
-            name: string;
+        /**
+         * 必ずタスク名指定で実行する
+         */
+        name: {
+            $eq: factory.taskName;
+            $in?: never;
+        } | {
+            $eq?: never;
+            $in: factory.taskName[];
         };
         runsAt: {
             $lt: Date;
@@ -133,6 +136,10 @@ export declare class TaskRepo {
             numberOfTried?: factory.sortType;
             runsAt?: factory.sortType;
         };
+        executor: {
+            name: string;
+        };
+        nameFilterBeforeRunsAt: boolean;
     }, next?: INextFunction): Promise<Pick<factory.task.ITask<factory.taskName>, 'id' | 'name'> | null>;
     /**
      * Readyのままで期限切れのタスクをExpiredに変更する

package/lib/chevre/repo/task.js

@@ -460,7 +460,7 @@ class TaskRepo {
     emitRunningIfExists(params, next // support next function(2025-08-02~)
     ) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b;
+            var _a;
             if (!(params.runsAt.$lt instanceof Date)) {
                 throw new factory.errors.Argument('runsAt.$lt', 'must be Date');
             }
@@ -471,12 +471,20 @@ class TaskRepo {
             };
             const nameEq = (_a = params.name) === null || _a === void 0 ? void 0 : _a.$eq;
             // const nameNin = params.name?.$nin;
-            const nameIn = (_b = params.name) === null || _b === void 0 ? void 0 : _b.$in;
-            const doc = yield this.taskModel.findOneAndUpdate(Object.assign({ status: { $eq: factory.taskStatus.Ready }, runsAt: { $lt: params.runsAt.$lt } }, (typeof nameEq === 'string' || Array.isArray(nameIn))
-                ? {
-                    name: Object.assign(Object.assign({}, (typeof nameEq === 'string') ? { $eq: nameEq } : undefined), (Array.isArray(nameIn)) ? { $in: nameIn } : undefined)
-                }
-                : undefined), {
+            // const nameIn = params.name?.$in;
+            const { nameFilterBeforeRunsAt } = params;
+            const filter = Object.assign(Object.assign(Object.assign({ status: { $eq: factory.taskStatus.Ready } }, (nameFilterBeforeRunsAt) ? { name: params.name } : undefined), { runsAt: { $lt: params.runsAt.$lt } }), (!nameFilterBeforeRunsAt) ? { name: params.name } : undefined
+            // ...(typeof nameEq === 'string' || Array.isArray(nameIn))
+            //     ? {
+            //         name: {
+            //             ...(typeof nameEq === 'string') ? { $eq: nameEq } : undefined,
+            //             // ...(Array.isArray(nameNin)) ? { $nin: nameNin } : undefined
+            //             ...(Array.isArray(nameIn)) ? { $in: nameIn } : undefined
+            //         }
+            //     }
+            //     : undefined
+            );
+            const doc = yield this.taskModel.findOneAndUpdate(filter, {
                 $set: {
                     status: factory.taskStatus.Running, // 実行中に変更
                     lastTriedAt: new Date(),
@@ -650,10 +658,8 @@ class TaskRepo {
                 .exec();
             // emit event(2025-05-26~)
             if (typeof next === 'function') {
-                if (status !== factory.taskStatus.Executed) {
-                    const changedTask = { id, name, status, remainingNumberOfTries, executionResult };
-                    task_1.taskEventEmitter.emitTaskStatusChanged(changedTask, next);
-                }
+                const changedTask = { id, name, status, remainingNumberOfTries, executionResult };
+                task_1.taskEventEmitter.emitTaskStatusChanged(changedTask, next);
             }
         });
     }

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.30"
+  "version": "22.11.0-alpha.32"
 }