@chevre/domain 20.2.0-alpha.21 → 20.2.0-alpha.22

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

@@ -6,7 +6,7 @@ import * as factory from '../factory';
 export declare class MongoRepository {
     readonly taskModel: typeof Model;
     constructor(connection: Connection);
-    static CREATE_MONGO_CONDITIONS<T extends factory.taskName>(params: factory.task.ISearchConditions<T>): any[];
+    static CREATE_MONGO_CONDITIONS(params: factory.task.ISearchConditions): any[];
     save(taskAttributes: factory.task.IAttributes<factory.taskName>): Promise<factory.task.ITask<factory.taskName>>;
     saveMany(taskAttributes: factory.task.IAttributes<factory.taskName>[]): Promise<any[]>;
     executeOneByName<T extends factory.taskName>(params: {
@@ -29,11 +29,11 @@ export declare class MongoRepository {
         name: T;
         id: string;
     }): Promise<factory.task.ITask<T>>;
-    count<T extends factory.taskName>(params: factory.task.ISearchConditions<T>): Promise<number>;
+    count(params: factory.task.ISearchConditions): Promise<number>;
     /**
      * 検索する
      */
-    search<T extends factory.taskName>(params: factory.task.ISearchConditions<T>, projection?: any): Promise<factory.task.ITask<T>[]>;
+    search(params: factory.task.ISearchConditions, projection?: any): Promise<factory.task.ITask<factory.taskName>[]>;
     deleteByProject(params: {
         project: {
             id: string;

package/lib/chevre/repo/task.js

@@ -29,29 +29,24 @@ class MongoRepository {
     }
     // tslint:disable-next-line:max-func-body-length
     static CREATE_MONGO_CONDITIONS(params) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
-        const andConditions = [{
-                name: { $exists: true }
-            }];
-        // tslint:disable-next-line:no-single-line-block-comment
-        /* istanbul ignore else */
-        if (params.project !== undefined) {
-            if (params.project.id !== undefined && params.project.id !== null) {
-                if (typeof params.project.id.$eq === 'string') {
-                    andConditions.push({
-                        'project.id': {
-                            $eq: params.project.id.$eq
-                        }
-                    });
-                }
-            }
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
+        const andConditions = [];
+        const projectIdEq = (_b = (_a = params.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$eq;
+        if (typeof projectIdEq === 'string') {
+            andConditions.push({ 'project.id': { $eq: projectIdEq } });
         }
-        // tslint:disable-next-line:no-single-line-block-comment
-        /* istanbul ignore else */
-        if (params.name !== undefined) {
-            andConditions.push({
-                name: params.name
-            });
+        if (typeof params.name === 'string') {
+            andConditions.push({ name: { $eq: params.name } });
+        }
+        else {
+            const nameIn = (_c = params.name) === null || _c === void 0 ? void 0 : _c.$in;
+            if (Array.isArray(nameIn)) {
+                andConditions.push({ name: { $in: nameIn } });
+            }
+            const nameNin = (_d = params.name) === null || _d === void 0 ? void 0 : _d.$nin;
+            if (Array.isArray(nameNin)) {
+                andConditions.push({ name: { $nin: nameNin } });
+            }
         }
         // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
@@ -94,7 +89,7 @@ class MongoRepository {
                 }
             });
         }
-        const dateAbortedGte = (_a = params.dateAborted) === null || _a === void 0 ? void 0 : _a.$gte;
+        const dateAbortedGte = (_e = params.dateAborted) === null || _e === void 0 ? void 0 : _e.$gte;
         if (dateAbortedGte instanceof Date) {
             andConditions.push({
                 dateAborted: {
@@ -103,7 +98,7 @@ class MongoRepository {
                 }
             });
         }
-        const dateAbortedLte = (_b = params.dateAborted) === null || _b === void 0 ? void 0 : _b.$lte;
+        const dateAbortedLte = (_f = params.dateAborted) === null || _f === void 0 ? void 0 : _f.$lte;
         if (dateAbortedLte instanceof Date) {
             andConditions.push({
                 dateAborted: {
@@ -112,7 +107,7 @@ class MongoRepository {
                 }
             });
         }
-        const objectTransactionNumberEq = (_e = (_d = (_c = params.data) === null || _c === void 0 ? void 0 : _c.object) === null || _d === void 0 ? void 0 : _d.transactionNumber) === null || _e === void 0 ? void 0 : _e.$eq;
+        const objectTransactionNumberEq = (_j = (_h = (_g = params.data) === null || _g === void 0 ? void 0 : _g.object) === null || _h === void 0 ? void 0 : _h.transactionNumber) === null || _j === void 0 ? void 0 : _j.$eq;
         if (typeof objectTransactionNumberEq === 'string') {
             andConditions.push({
                 'data.object.transactionNumber': {
@@ -121,7 +116,7 @@ class MongoRepository {
                 }
             });
         }
-        const objectPurposeIdEq = (_h = (_g = (_f = params.data) === null || _f === void 0 ? void 0 : _f.purpose) === null || _g === void 0 ? void 0 : _g.id) === null || _h === void 0 ? void 0 : _h.$eq;
+        const objectPurposeIdEq = (_m = (_l = (_k = params.data) === null || _k === void 0 ? void 0 : _k.purpose) === null || _l === void 0 ? void 0 : _l.id) === null || _m === void 0 ? void 0 : _m.$eq;
         if (typeof objectPurposeIdEq === 'string') {
             andConditions.push({
                 'data.purpose.id': {
@@ -130,7 +125,7 @@ class MongoRepository {
                 }
             });
         }
-        const objectPurposeOrderNumberEq = (_l = (_k = (_j = params.data) === null || _j === void 0 ? void 0 : _j.purpose) === null || _k === void 0 ? void 0 : _k.orderNumber) === null || _l === void 0 ? void 0 : _l.$eq;
+        const objectPurposeOrderNumberEq = (_q = (_p = (_o = params.data) === null || _o === void 0 ? void 0 : _o.purpose) === null || _p === void 0 ? void 0 : _p.orderNumber) === null || _q === void 0 ? void 0 : _q.$eq;
         if (typeof objectPurposeOrderNumberEq === 'string') {
             andConditions.push({
                 'data.purpose.orderNumber': {

package/lib/chevre/service/task.js

@@ -113,16 +113,13 @@ function abort(params) {
 exports.abort = abort;
 function notifyAbortedTasks(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        let abortedTasks = yield repos.task.search({
-            statuses: [factory.taskStatus.Aborted],
-            dateAborted: {
-                $gte: params.dateAbortedGte
-            }
-        });
+        const abortedTasks = yield repos.task.search(Object.assign({ statuses: [factory.taskStatus.Aborted], dateAborted: { $gte: params.dateAbortedGte } }, (settings_1.ABORTED_TASKS_WITHOUT_REPORT.length > 0)
+            ? { name: { $nin: settings_1.ABORTED_TASKS_WITHOUT_REPORT } }
+            : undefined));
         // 中止を報告しないタスク以外にフィルター
-        abortedTasks = abortedTasks.filter((task) => {
-            return !settings_1.ABORTED_TASKS_WITHOUT_REPORT.includes(task.name);
-        });
+        // abortedTasks = abortedTasks.filter((task) => {
+        //     return !ABORTED_TASKS_WITHOUT_REPORT.includes(task.name);
+        // });
         if (abortedTasks.length > 0) {
             // 開発者へ報告
             const message = (0, factory_1.tasks2lineNotify)({ tasks: abortedTasks });

package/package.json

@@ -9,7 +9,7 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.282.0",
+    "@chevre/factory": "4.283.0",
     "@cinerino/sdk": "3.135.0",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
@@ -120,5 +120,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "20.2.0-alpha.21"
+  "version": "20.2.0-alpha.22"
 }