@chevre/domain 22.4.0-alpha.2 → 22.4.0-alpha.4

package/example/src/chevre/cancelEvent.ts

@@ -0,0 +1,22 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+const project = { id: String(process.env.PROJECT_ID) };
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI);
+
+    const eventRepo = await chevre.repository.Event.createInstance(mongoose.connection);
+
+    const result = await eventRepo.cancelEvent({
+        project: { id: project.id },
+        id: '7iri6w0m1h1hu5y'
+    });
+    console.log(result);
+}
+
+main()
+    .then()
+    .catch(console.error);

package/example/src/chevre/projectFields.ts

@@ -8,7 +8,7 @@ const project = { id: String(process.env.PROJECT_ID) };
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
-    const repo = await chevre.repository.OfferItemCondition.createInstance(mongoose.connection);
+    const repo = await chevre.repository.Task.createInstance(mongoose.connection);
 
     const docs = await repo.projectFields(
         {
@@ -16,7 +16,7 @@ async function main() {
             page: 1,
             project: { id: { $eq: project.id } }
         },
-        ['id', 'identifier', 'itemOffered', 'typeOf']
+        ['id', 'identifier', 'data']
     );
     // tslint:disable-next-line:no-null-keyword
     console.dir(docs, { depth: null });

package/lib/chevre/repo/action.js

@@ -1179,7 +1179,7 @@ class ActionRepo {
             };
             const options = {
                 upsert: true,
-                rawResult: true
+                includeResultMetadata: true
             };
             return this.actionRecipeModel.updateOne(filter, update, options)
                 .exec();
@@ -1204,7 +1204,7 @@ class ActionRepo {
             };
             const options = {
                 upsert: true,
-                rawResult: true
+                includeResultMetadata: true
             };
             return this.actionModel.updateOne(filter, update, options)
                 .exec();
@@ -1535,7 +1535,7 @@ class ActionRepo {
             };
             const options = {
                 upsert: true,
-                rawResult: true
+                includeResultMetadata: true
             };
             return this.actionRecipeModel.updateOne(filter, update, options)
                 .exec();

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

@@ -196,7 +196,7 @@ export declare class EventRepo {
             id: string;
         };
         id: string;
-    }): Promise<void>;
+    }): Promise<import("mongoose").UpdateWriteOpResult>;
     /**
      * 興行イベントのsuperEventを最新の情報に同期する
      */

package/lib/chevre/repo/event.js

@@ -753,10 +753,10 @@ class EventRepo {
      */
     cancelEvent(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.eventModel.updateOne({
+            return this.eventModel.updateOne({
                 _id: { $eq: params.id },
                 'project.id': { $eq: params.project.id }
-            }, { $set: { eventStatus: factory.eventStatusType.EventCancelled } }, { rawResult: true })
+            }, { $set: { eventStatus: factory.eventStatusType.EventCancelled } }, { includeResultMetadata: true })
                 .exec();
         });
     }
@@ -922,31 +922,10 @@ class EventRepo {
                 $push: {
                     'offers.seller.makesOffer': params.offers.seller.makesOffer
                 }
-            }, { rawResult: true })
+            }, { includeResultMetadata: true })
                 .exec();
         });
     }
-    // public async deleteAvailableAtOrFrom(params: {
-    //     id: string;
-    //     offers: {
-    //         seller: {
-    //             makesOffer: { availableAtOrFrom: { id: string } };
-    //         };
-    //     };
-    // }): Promise<void> {
-    //     await this.eventModel.updateOne(
-    //         { _id: { $eq: params.id } },
-    //         {
-    //             $pull: {
-    //                 'offers.seller.makesOffer': {
-    //                     'availableAtOrFrom.id': { $eq: params.offers.seller.makesOffer.availableAtOrFrom.id }
-    //                 }
-    //             }
-    //         },
-    //         { rawResult: true }
-    //     )
-    //         .exec();
-    // }
     unsetUnnecessaryFields(params) {
         return __awaiter(this, void 0, void 0, function* () {
             return this.eventModel.updateMany(params.filter, { $unset: params.$unset }, { timestamps: false })

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

@@ -48,10 +48,7 @@ interface IOptionOnCreate {
 export type IExecutableTaskKeys = 'data' | 'id' | 'name' | 'status' | 'numberOfTried' | 'project' | 'remainingNumberOfTries' | 'runsAt' | 'expires';
 export type IExecutableTask<T extends factory.taskName> = Pick<factory.task.ITask<T>, IExecutableTaskKeys>;
 type IDelayedTask = Pick<factory.task.ITask<factory.taskName>, 'id' | 'name' | 'status'>;
-type IKeyOfProjection = keyof factory.task.ITask<factory.taskName> | '_id';
-type IProjection = {
-    [key in IKeyOfProjection]?: 0 | 1;
-};
+type IKeyOfProjection = keyof factory.task.ITask<factory.taskName>;
 /**
  * タスクリポジトリ
  */
@@ -120,9 +117,7 @@ export declare class TaskRepo {
              */
             $nin?: factory.taskName[];
         };
-    }): Promise<(import("mongoose").Document<unknown, {}, IDelayedTask> & IDelayedTask & {
-        _id: import("mongoose").Types.ObjectId;
-    })[]>;
+    }): Promise<IDelayedTask[]>;
     /**
      * 実行中ステータスのままになっているタスクをリトライする
      */
@@ -154,15 +149,11 @@ export declare class TaskRepo {
     /**
      * 特定タスク検索
      */
-    findById<T extends factory.taskName>(params: {
-        name: T;
-        id: string;
-    }): Promise<factory.task.ITask<T>>;
     count(params: factory.task.ISearchConditions): Promise<number>;
     /**
      * 検索する
      */
-    search(params: factory.task.ISearchConditions, projection?: IProjection): Promise<factory.task.ITask<factory.taskName>[]>;
+    projectFields(params: factory.task.ISearchConditions, inclusion: IKeyOfProjection[]): Promise<factory.task.ITask<factory.taskName>[]>;
     deleteByProject(params: {
         project: {
             id: string;

package/lib/chevre/repo/task.js

@@ -11,10 +11,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TaskRepo = void 0;
 const moment = require("moment");
+const task_1 = require("../eventEmitter/task");
 const factory = require("../factory");
-const task_1 = require("./mongoose/schemas/task");
-const task_2 = require("../eventEmitter/task");
 const settings_1 = require("../settings");
+const task_2 = require("./mongoose/schemas/task");
 /**
  * タスク実行時のソート条件
  */
@@ -22,12 +22,28 @@ const sortOrder4executionOfTasks = {
     numberOfTried: factory.sortType.Ascending,
     runsAt: factory.sortType.Ascending // 実行予定日時の早さ優先
 };
+// type IProjection = { [key in IKeyOfProjection]?: 0 | 1; };
+const AVAILABLE_PROJECT_FIELDS = [
+    'identifier',
+    'project',
+    'name',
+    'status',
+    'runsAt',
+    'remainingNumberOfTries',
+    'lastTriedAt',
+    'numberOfTried',
+    'executionResults',
+    'executor',
+    'data',
+    'dateAborted',
+    'expires'
+];
 /**
  * タスクリポジトリ
  */
 class TaskRepo {
     constructor(connection) {
-        this.taskModel = connection.model(task_1.modelName, (0, task_1.createSchema)());
+        this.taskModel = connection.model(task_2.modelName, (0, task_2.createSchema)());
     }
     // tslint:disable-next-line:max-func-body-length
     static CREATE_MONGO_CONDITIONS(params) {
@@ -150,7 +166,7 @@ class TaskRepo {
             }
             const { emitImmediately } = options;
             if (emitImmediately) {
-                task_2.taskEventEmitter.emitTaskStatusChanged({
+                task_1.taskEventEmitter.emitTaskStatusChanged({
                     id,
                     status: factory.taskStatus.Ready
                 });
@@ -172,7 +188,7 @@ class TaskRepo {
                 });
                 if (emitImmediately) {
                     savedTasks.forEach((savedTask) => {
-                        task_2.taskEventEmitter.emitTaskStatusChanged({
+                        task_1.taskEventEmitter.emitTaskStatusChanged({
                             id: savedTask.id,
                             status: factory.taskStatus.Ready
                         });
@@ -197,16 +213,22 @@ class TaskRepo {
      */
     findByIdentifier(params) {
         return __awaiter(this, void 0, void 0, function* () {
+            const projection = {
+                _id: 0,
+                id: { $toString: '$_id' },
+                status: 1
+            };
             const doc = yield this.taskModel.findOne({
                 'project.id': { $eq: params.project.id },
                 name: { $eq: params.name },
                 identifier: { $exists: true, $eq: params.identifier }
-            }, { _id: 1, status: 1 })
+            }, projection)
+                .lean() // lean(2024-09-26~)
                 .exec();
             if (doc === null) {
                 return;
             }
-            const { id, status } = doc.toObject();
+            const { id, status } = doc;
             return { id, status };
         });
     }
@@ -226,7 +248,7 @@ class TaskRepo {
                 .select({ _id: 1 })
                 .exec();
             if (options.emitImmediately) {
-                task_2.taskEventEmitter.emitTaskStatusChanged({
+                task_1.taskEventEmitter.emitTaskStatusChanged({
                     id: createdTask.id,
                     name: params.name,
                     status: factory.taskStatus.Ready
@@ -247,7 +269,7 @@ class TaskRepo {
                 .select({ _id: 1 })
                 .exec();
             if (options.emitImmediately) {
-                task_2.taskEventEmitter.emitTaskStatusChanged({
+                task_1.taskEventEmitter.emitTaskStatusChanged({
                     id: createdTask.id,
                     name: params.name,
                     status: factory.taskStatus.Ready
@@ -271,7 +293,7 @@ class TaskRepo {
                 .select({ _id: 1 })
                 .exec();
             if (options.emitImmediately) {
-                task_2.taskEventEmitter.emitTaskStatusChanged({
+                task_1.taskEventEmitter.emitTaskStatusChanged({
                     id: createdTask.id,
                     name: params.name,
                     status: factory.taskStatus.Ready
@@ -326,7 +348,7 @@ class TaskRepo {
                 .select({ _id: 1 })
                 .exec();
             if (options.emitImmediately) {
-                task_2.taskEventEmitter.emitTaskStatusChanged({
+                task_1.taskEventEmitter.emitTaskStatusChanged({
                     id: createdTask.id,
                     name: params.name,
                     status: factory.taskStatus.Ready
@@ -334,60 +356,21 @@ class TaskRepo {
             }
         });
     }
-    // public async createSendOrderTaskIfNotExist(
-    //     params: factory.task.IAttributes<factory.taskName.SendOrder>,
-    //     options: IOptionOnCreate
-    // ): Promise<void> {
-    //     const createdTask = await this.taskModel.findOneAndUpdate(
-    //         {
-    //             'project.id': { $eq: params.project.id },
-    //             name: { $eq: params.name },
-    //             'data.object.orderNumber': {
-    //                 $exists: true,
-    //                 $eq: String(params.data.object.orderNumber)
-    //             }
-    //         },
-    //         { $setOnInsert: params },
-    //         { new: true, upsert: true }
-    //     )
-    //         .select({ _id: 1 })
-    //         .exec();
-    //     if (options.emitImmediately) {
-    //         taskEventEmitter.emitTaskStatusChanged({
-    //             id: createdTask.id,
-    //             name: params.name,
-    //             status: factory.taskStatus.Ready
-    //         });
-    //     }
-    // }
-    // public async createOnOrderPaymentCompletedTaskIfNotExist(
-    //     params: factory.task.IAttributes<factory.taskName.OnOrderPaymentCompleted>,
-    //     options: IOptionOnCreate
-    // ): Promise<void> {
-    //     const createdTask = await this.taskModel.findOneAndUpdate(
-    //         {
-    //             'project.id': { $eq: params.project.id },
-    //             name: { $eq: params.name },
-    //             'data.object.orderNumber': {
-    //                 $exists: true,
-    //                 $eq: String(params.data.object.orderNumber)
-    //             }
-    //         },
-    //         { $setOnInsert: params },
-    //         { new: true, upsert: true }
-    //     )
-    //         .select({ _id: 1 })
-    //         .exec();
-    //     if (options.emitImmediately) {
-    //         taskEventEmitter.emitTaskStatusChanged({
-    //             id: createdTask.id,
-    //             name: params.name,
-    //             status: factory.taskStatus.Ready
-    //         });
-    //     }
-    // }
     executeById(params) {
         return __awaiter(this, void 0, void 0, function* () {
+            const projection = {
+                _id: 0,
+                id: { $toString: '$_id' },
+                // 必要最低限にprojection(2024-04-23~)
+                data: 1,
+                name: 1,
+                status: 1,
+                numberOfTried: 1,
+                project: 1,
+                remainingNumberOfTries: 1,
+                runsAt: 1,
+                expire: 1
+            };
             const doc = yield this.taskModel.findOneAndUpdate({
                 status: { $eq: factory.taskStatus.Ready },
                 runsAt: { $lt: new Date() },
@@ -402,30 +385,31 @@ class TaskRepo {
                     remainingNumberOfTries: -1,
                     numberOfTried: 1 // トライ回数増やす
                 }
-            }, {
-                new: true,
-                // 必要最低限にprojection(2024-04-23~)
-                projection: {
-                    data: 1,
-                    name: 1,
-                    status: 1,
-                    numberOfTried: 1,
-                    project: 1,
-                    remainingNumberOfTries: 1,
-                    runsAt: 1,
-                    expire: 1
-                }
-            })
+            }, { new: true, projection })
+                .lean() // lean(2024-09-26~)
                 .exec();
             if (doc === null) {
                 // tslint:disable-next-line:no-null-keyword
                 return null;
             }
-            return doc.toObject();
+            return doc;
         });
     }
     executeOneByName(params) {
         return __awaiter(this, void 0, void 0, function* () {
+            const projection = {
+                _id: 0,
+                id: { $toString: '$_id' },
+                // 必要最低限にprojection(2024-04-23~)
+                data: 1,
+                name: 1,
+                status: 1,
+                numberOfTried: 1,
+                project: 1,
+                remainingNumberOfTries: 1,
+                runsAt: 1,
+                expire: 1
+            };
             const doc = yield this.taskModel.findOneAndUpdate({
                 status: { $eq: factory.taskStatus.Ready },
                 runsAt: { $lt: new Date() },
@@ -440,27 +424,15 @@ class TaskRepo {
                     remainingNumberOfTries: -1,
                     numberOfTried: 1 // トライ回数増やす
                 }
-            }, {
-                new: true,
-                // 必要最低限にprojection(2024-04-23~)
-                projection: {
-                    data: 1,
-                    name: 1,
-                    status: 1,
-                    numberOfTried: 1,
-                    project: 1,
-                    remainingNumberOfTries: 1,
-                    runsAt: 1,
-                    expire: 1
-                }
-            })
+            }, { new: true, projection })
                 .sort(sortOrder4executionOfTasks)
+                .lean() // lean(2024-09-26~)
                 .exec();
             if (doc === null) {
                 // tslint:disable-next-line:no-null-keyword
                 return null;
             }
-            return doc.toObject();
+            return doc;
         });
     }
     /**
@@ -471,18 +443,25 @@ class TaskRepo {
             const runsAtLt = moment(params.now)
                 .add(-params.delayInSeconds, 'seconds')
                 .toDate();
-            const delayedTasks = yield this.taskModel.find(Object.assign(Object.assign({ status: { $eq: factory.taskStatus.Ready }, runsAt: { $lt: runsAtLt } }, (Array.isArray(params.name.$in)) ? { name: { $in: params.name.$in } } : undefined), (Array.isArray(params.name.$nin)) ? { name: { $nin: params.name.$nin } } : undefined))
-                .select({
-                _id: 1,
+            const projection = {
+                _id: 0,
+                id: { $toString: '$_id' },
                 name: 1,
                 status: 1
-            })
+            };
+            const delayedTasks = yield this.taskModel.find(Object.assign(Object.assign({ status: { $eq: factory.taskStatus.Ready }, runsAt: { $lt: runsAtLt } }, (Array.isArray(params.name.$in)) ? { name: { $in: params.name.$in } } : undefined), (Array.isArray(params.name.$nin)) ? { name: { $nin: params.name.$nin } } : undefined), projection)
+                // .select({
+                //     _id: 1,
+                //     name: 1,
+                //     status: 1
+                // })
                 .limit(params.limit)
                 .setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+                .lean() // lean(2024-09-26~)
                 .exec();
             if (delayedTasks.length > 0) {
                 delayedTasks.forEach((delayedTask) => {
-                    task_2.taskEventEmitter.emitTaskStatusChanged({
+                    task_1.taskEventEmitter.emitTaskStatusChanged({
                         id: delayedTask.id,
                         name: delayedTask.name,
                         status: delayedTask.status
@@ -540,6 +519,7 @@ class TaskRepo {
             const lastTriedAtShoudBeLessThan = moment()
                 .add(-params.intervalInMinutes, 'minutes')
                 .toDate();
+            const projection = Object.assign({ _id: 0, id: { $toString: '$_id' } }, Object.fromEntries(AVAILABLE_PROJECT_FIELDS.map((key) => ([key, 1]))));
             const doc = yield this.taskModel.findOneAndUpdate({
                 status: { $eq: factory.taskStatus.Running },
                 lastTriedAt: {
@@ -552,13 +532,14 @@ class TaskRepo {
                     status: factory.taskStatus.Aborted,
                     dateAborted: new Date()
                 }
-            }, { new: true })
+            }, { new: true, projection })
+                .lean() // lean(2024-09-26~)
                 .exec();
             if (doc === null) {
                 // tslint:disable-next-line:no-null-keyword
                 return null;
             }
-            return doc.toObject();
+            return doc;
         });
     }
     abortMany(params) {
@@ -601,23 +582,27 @@ class TaskRepo {
     /**
      * 特定タスク検索
      */
-    findById(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const doc = yield this.taskModel.findOne({
-                name: { $eq: params.name },
-                _id: { $eq: params.id }
-            }, {
-                __v: 0,
-                createdAt: 0,
-                updatedAt: 0
-            })
-                .exec();
-            if (doc === null) {
-                throw new factory.errors.NotFound('Task');
-            }
-            return doc.toObject();
-        });
-    }
+    // public async findById<T extends factory.taskName>(params: {
+    //     name: T;
+    //     id: string;
+    // }): Promise<factory.task.ITask<T>> {
+    //     const doc = await this.taskModel.findOne(
+    //         {
+    //             name: { $eq: params.name },
+    //             _id: { $eq: params.id }
+    //         },
+    //         {
+    //             __v: 0,
+    //             createdAt: 0,
+    //             updatedAt: 0
+    //         }
+    //     )
+    //         .exec();
+    //     if (doc === null) {
+    //         throw new factory.errors.NotFound('Task');
+    //     }
+    //     return doc.toObject();
+    // }
     count(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = TaskRepo.CREATE_MONGO_CONDITIONS(params);
@@ -629,30 +614,36 @@ class TaskRepo {
     /**
      * 検索する
      */
-    search(params, projection) {
+    projectFields(params, 
+    // projection?: IProjection
+    inclusion) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = TaskRepo.CREATE_MONGO_CONDITIONS(params);
-            const positiveProjectionExists = (projection !== undefined && projection !== null)
-                ? Object.values(projection)
-                    .some((value) => value !== 0)
-                : false;
-            const query = this.taskModel.find((conditions.length > 0) ? { $and: conditions } : {}, (positiveProjectionExists)
-                ? projection
-                : Object.assign({ __v: 0, createdAt: 0, updatedAt: 0 }, projection));
+            // const positiveProjectionExists: boolean = (projection !== undefined && projection !== null)
+            //     ? Object.values(projection)
+            //         .some((value) => value !== 0)
+            //     : false;
+            let positiveProjectionFields = AVAILABLE_PROJECT_FIELDS;
+            if (Array.isArray(inclusion) && inclusion.length > 0) {
+                positiveProjectionFields = inclusion.filter((key) => AVAILABLE_PROJECT_FIELDS.includes(key));
+            }
+            else {
+                // no op
+            }
+            const projection = Object.assign({ _id: 0, id: { $toString: '$_id' } }, Object.fromEntries(positiveProjectionFields.map((key) => ([key, 1]))));
+            const query = this.taskModel.find((conditions.length > 0) ? { $and: conditions } : {}, projection);
             if (typeof params.limit === 'number' && params.limit > 0) {
                 const page = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;
                 query.limit(params.limit)
                     .skip(params.limit * (page - 1));
             }
-            // tslint:disable-next-line:no-single-line-block-comment
-            /* istanbul ignore else */
             if (((_a = params.sort) === null || _a === void 0 ? void 0 : _a.runsAt) !== undefined) {
                 query.sort({ runsAt: params.sort.runsAt });
             }
             return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-                .exec()
-                .then((docs) => docs.map((doc) => doc.toObject()));
+                .lean() // lean(2024-09-26~)
+                .exec();
         });
     }
     deleteByProject(params) {

package/lib/chevre/service/offer/eventServiceByCOA/findAcceptAction.js

@@ -15,16 +15,13 @@ function findAcceptAction(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b;
         // タスク検索
-        const task = (yield repos.task.search({
+        const task = (yield repos.task.projectFields({
             limit: 1,
             page: 1,
             id: { $eq: params.sameAs.id },
             project: { id: { $eq: params.project.id } },
             name: factory.taskName.AcceptCOAOffer
-        }, {
-            status: 1,
-            executionResults: 1
-        })).shift();
+        }, ['status', 'executionResults'])).shift();
         if (task === undefined) {
             throw new factory.errors.NotFound(factory.taskName.AcceptCOAOffer);
         }

package/lib/chevre/service/order/onOrderStatusChanged/onOrderPaymentDue.js

@@ -60,7 +60,7 @@ function createConfirmPayTransactionTasks(order, simpleOrder) {
                 return;
             }
             // 冗長なタスク作成を回避
-            const existingTasks = yield repos.task.search({
+            const existingTasks = yield repos.task.projectFields({
                 limit: 1,
                 page: 1,
                 project: { id: { $eq: order.project.id } },
@@ -69,10 +69,12 @@ function createConfirmPayTransactionTasks(order, simpleOrder) {
                     object: { transactionNumber: { $eq: invoice.paymentMethodId } },
                     purpose: { orderNumber: { $eq: order.orderNumber } }
                 }
-            }, {
-                data: 0, executionResults: 0, name: 0, numberOfTried: 0,
-                remainingNumberOfTries: 0, runsAt: 0, status: 0
-            });
+            }, ['id']
+            // {
+            //     data: 0, executionResults: 0, name: 0, numberOfTried: 0,
+            //     remainingNumberOfTries: 0, runsAt: 0, status: 0
+            // }
+            );
             if (existingTasks.length === 0) {
                 const data = {
                     project: order.project,

package/lib/chevre/service/payment/any.js

@@ -475,16 +475,13 @@ function findAuthorizeAction(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b;
         // タスク検索
-        const task = (yield repos.task.search({
+        const task = (yield repos.task.projectFields({
             limit: 1,
             page: 1,
             id: { $eq: params.sameAs.id },
             project: { id: { $eq: params.project.id } },
             name: factory.taskName.AuthorizePayment
-        }, {
-            status: 1,
-            executionResults: 1
-        })).shift();
+        }, ['status', 'executionResults'])).shift();
         if (task === undefined) {
             throw new factory.errors.NotFound(factory.taskName.AuthorizePayment);
         }
@@ -529,16 +526,13 @@ function findCheckAction(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b;
         // タスク検索
-        const task = (yield repos.task.search({
+        const task = (yield repos.task.projectFields({
             limit: 1,
             page: 1,
             id: { $eq: params.sameAs.id },
             project: { id: { $eq: params.project.id } },
             name: factory.taskName.CheckMovieTicket
-        }, {
-            status: 1,
-            executionResults: 1
-        })).shift();
+        }, ['status', 'executionResults'])).shift();
         if (task === undefined) {
             throw new factory.errors.NotFound(factory.taskName.CheckMovieTicket);
         }
@@ -588,16 +582,13 @@ function findAcceptAction(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b;
         // タスク検索
-        const task = (yield repos.task.search({
+        const task = (yield repos.task.projectFields({
             limit: 1,
             page: 1,
             id: { $eq: params.sameAs.id },
             project: { id: { $eq: params.project.id } },
             name: factory.taskName.PublishPaymentUrl
-        }, {
-            status: 1,
-            executionResults: 1
-        })).shift();
+        }, ['status', 'executionResults'])).shift();
         if (task === undefined) {
             throw new factory.errors.NotFound(factory.taskName.PublishPaymentUrl);
         }

package/lib/chevre/service/task.js

@@ -171,9 +171,9 @@ exports.abort = abort;
 function notifyAbortedTasks(params) {
     return (repos, settings, credentials) => __awaiter(this, void 0, void 0, function* () {
         const { abortedTasksWithoutReport } = settings;
-        const abortedTasks = yield repos.task.search(Object.assign({ statuses: [factory.taskStatus.Aborted], dateAborted: { $gte: params.dateAbortedGte } }, (abortedTasksWithoutReport.length > 0)
+        const abortedTasks = yield repos.task.projectFields(Object.assign({ statuses: [factory.taskStatus.Aborted], dateAborted: { $gte: params.dateAbortedGte } }, (abortedTasksWithoutReport.length > 0)
             ? { name: { $nin: abortedTasksWithoutReport } }
-            : undefined));
+            : undefined), []);
         if (abortedTasks.length > 0) {
             if (notification === undefined) {
                 notification = yield Promise.resolve().then(() => require('./notification'));

package/package.json

@@ -110,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.4.0-alpha.2"
+  "version": "22.4.0-alpha.4"
 }

package/example/src/chevre/searchTasks.ts

@@ -1,43 +0,0 @@
-// tslint:disable:no-implicit-dependencies no-console
-import { chevre } from '../../../lib/index';
-
-import * as  mongoose from 'mongoose';
-
-// const project = { id: String(process.env.PROJECT_ID) };
-
-mongoose.Model.on('index', (...args) => {
-    console.error('******** index event emitted. ********\n', args);
-});
-
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
-
-    const indexes = await mongoose.connection.db.collection('tasks')
-        .indexes();
-    // console.log(indexes);
-    console.log(indexes.length, 'indexes found');
-
-    const taskRepo = await chevre.repository.Task.createInstance(mongoose.connection);
-    const tasks = await taskRepo.search(
-        {
-            limit: 1,
-            page: 1
-            // typeOf: { $eq: chevre.factory.actionType.CheckAction },
-            // project: { id: { $eq: project.id } },
-            // object: {
-            //     movieTickets: {
-            //         identifier: { $eq: '0947524082' },
-            //         serviceOutput: { reservationFor: { id: { $eq: 'clhvvbpyn' } } }
-            //     }
-            // }
-            // instrument: { transactionNumber: { $eq: 'x' } },
-        }
-    );
-    console.log('tasks:', tasks);
-}
-
-main()
-    .then(() => {
-        console.log('success!');
-    })
-    .catch(console.error);