@chevre/domain 21.2.0-alpha.11 → 21.2.0-alpha.13

package/example/src/chevre/transaction/startExportTasks.ts

@@ -0,0 +1,19 @@
+// 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 transactionRepo = new chevre.repository.Transaction(mongoose.connection);
+    const result = await transactionRepo.startExportTasks({
+        typeOf: { $in: [chevre.factory.transactionType.PlaceOrder] },
+        status: chevre.factory.transactionStatusType.Confirmed
+    });
+    console.log(result);
+}
+
+main()
+    .then(console.log)
+    .catch(console.error);

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

@@ -42,16 +42,6 @@ export declare class MongoRepository {
         id?: string;
         transactionNumber?: string;
     }): Promise<factory.account.transaction.ITransaction<T>>;
-    /**
-     * タスク未エクスポートの取引をひとつ取得してエクスポートを開始する
-     */
-    /**
-     * タスクエクスポートリトライ
-     * TODO updatedAtを基準にしているが、タスクエクスポートトライ日時を持たせた方が安全か？
-     */
-    /**
-     * タスクをエクスポート済に変更する
-     */
     /**
      * 取引を期限切れにする
      */

package/lib/chevre/repo/accountTransaction.js

@@ -221,59 +221,6 @@ class MongoRepository {
             return doc.toObject();
         });
     }
-    /**
-     * タスク未エクスポートの取引をひとつ取得してエクスポートを開始する
-     */
-    // public async startExportTasks<T extends factory.account.transactionType>(
-    //     status: factory.transactionStatusType
-    // ): Promise<factory.account.transaction.ITransaction<T> | null> {
-    //     return this.transactionModel.findOneAndUpdate(
-    //         {
-    //             status: status,
-    //             tasksExportationStatus: factory.transactionTasksExportationStatus.Unexported
-    //         },
-    //         { tasksExportationStatus: factory.transactionTasksExportationStatus.Exporting },
-    //         { new: true }
-    //     )
-    //         .exec()
-    //         // tslint:disable-next-line:no-null-keyword
-    //         .then((doc) => (doc === null) ? null : doc.toObject());
-    // }
-    // tslint:disable-next-line:no-suspicious-comment
-    /**
-     * タスクエクスポートリトライ
-     * TODO updatedAtを基準にしているが、タスクエクスポートトライ日時を持たせた方が安全か？
-     */
-    // public async reexportTasks(params: { intervalInMinutes: number }): Promise<void> {
-    //     await this.transactionModel.updateMany(
-    //         {
-    //             tasksExportationStatus: factory.transactionTasksExportationStatus.Exporting,
-    //             updatedAt: {
-    //                 $lt: moment()
-    //                     .add(-params.intervalInMinutes, 'minutes')
-    //                     .toDate()
-    //             }
-    //         },
-    //         {
-    //             tasksExportationStatus: factory.transactionTasksExportationStatus.Unexported
-    //         }
-    //     )
-    //         .exec();
-    // }
-    /**
-     * タスクをエクスポート済に変更する
-     */
-    // public async setTasksExportedById(transactionId: string): Promise<void> {
-    //     await this.transactionModel.findByIdAndUpdate(
-    //         transactionId,
-    //         {
-    //             tasksExportationStatus: factory.transactionTasksExportationStatus.Exported,
-    //             tasksExportedAt: moment()
-    //                 .toDate()
-    //         }
-    //     )
-    //         .exec();
-    // }
     /**
      * 取引を期限切れにする
      */

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

@@ -100,7 +100,8 @@ export declare class MongoRepository {
             $in: T[];
         };
         status: factory.transactionStatusType;
-    }): Promise<factory.assetTransaction.ITransaction<T> | null>;
+        id?: string;
+    }): Promise<Pick<factory.assetTransaction.ITransaction<T>, 'id' | 'typeOf'> | null>;
     /**
      * タスクエクスポートリトライ
      * TODO updatedAtを基準にしているが、タスクエクスポートトライ日時を持たせた方が安全か？

package/lib/chevre/repo/assetTransaction.js

@@ -353,15 +353,14 @@ class MongoRepository {
      * タスク未エクスポートの取引をひとつ取得してエクスポートを開始する
      */
     startExportTasks(params) {
-        var _a, _b, _c;
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
-            return this.transactionModel.findOneAndUpdate(Object.assign(Object.assign(Object.assign({}, (typeof ((_a = params.project) === null || _a === void 0 ? void 0 : _a.id) === 'string')
-                ? {
-                    'project.id': {
-                        $eq: params.project.id
-                    }
-                } : undefined), (Array.isArray((_b = params.typeOf) === null || _b === void 0 ? void 0 : _b.$in))
-                ? { typeOf: { $in: (_c = params.typeOf) === null || _c === void 0 ? void 0 : _c.$in } } : undefined), { status: params.status, tasksExportationStatus: factory.transactionTasksExportationStatus.Unexported }), { tasksExportationStatus: factory.transactionTasksExportationStatus.Exporting }, { new: true })
+            const typeOfIn = (_a = params.typeOf) === null || _a === void 0 ? void 0 : _a.$in;
+            return this.transactionModel.findOneAndUpdate(Object.assign(Object.assign(Object.assign(Object.assign({}, (typeof ((_b = params.project) === null || _b === void 0 ? void 0 : _b.id) === 'string') ? { 'project.id': { $eq: params.project.id } } : undefined), (Array.isArray(typeOfIn)) ? { typeOf: { $in: typeOfIn } } : undefined), { status: params.status, tasksExportationStatus: factory.transactionTasksExportationStatus.Unexported }), (typeof params.id === 'string') ? { _id: { $eq: params.id } } : undefined), { tasksExportationStatus: factory.transactionTasksExportationStatus.Exporting }, { new: true })
+                .select({
+                _id: 1,
+                typeOf: 1
+            })
                 .exec()
                 // tslint:disable-next-line:no-null-keyword
                 .then((doc) => (doc === null) ? null : doc.toObject());
@@ -393,7 +392,7 @@ class MongoRepository {
      */
     setTasksExportedById(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.transactionModel.findByIdAndUpdate(params.id, {
+            yield this.transactionModel.updateOne({ _id: { $eq: params.id } }, {
                 tasksExportationStatus: factory.transactionTasksExportationStatus.Exported,
                 tasksExportedAt: moment()
                     .toDate()

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

@@ -88,7 +88,6 @@ export declare class MongoRepository {
         id: string;
         object?: {
             name?: string;
-            dateOnTransactionStatusChangedEmitted?: Date;
         };
     }): Promise<void>;
     /**
@@ -112,7 +111,8 @@ export declare class MongoRepository {
             $in: T[];
         };
         status: factory.transactionStatusType;
-    }): Promise<factory.transaction.ITransaction<T> | null>;
+        id?: string;
+    }): Promise<Pick<factory.transaction.ITransaction<T>, 'id' | 'typeOf'> | null>;
     /**
      * タスクエクスポートリトライ
      * TODO updatedAtを基準にしているが、タスクエクスポートトライ日時を持たせた方が安全か？

package/lib/chevre/repo/transaction.js

@@ -384,16 +384,14 @@ class MongoRepository {
      * 注文名称など
      */
     updateObject(params) {
-        var _a, _b;
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const doc = yield this.transactionModel.findOneAndUpdate({
                 _id: params.id,
                 typeOf: params.typeOf,
                 status: factory.transactionStatusType.InProgress
             }, {
-                $set: Object.assign(Object.assign({}, (typeof ((_a = params.object) === null || _a === void 0 ? void 0 : _a.name) === 'string') ? { 'object.name': params.object.name } : undefined), (((_b = params.object) === null || _b === void 0 ? void 0 : _b.dateOnTransactionStatusChangedEmitted) instanceof Date)
-                    ? { 'object.dateOnTransactionStatusChangedEmitted': params.object.dateOnTransactionStatusChangedEmitted }
-                    : undefined)
+                $set: Object.assign({}, (typeof ((_a = params.object) === null || _a === void 0 ? void 0 : _a.name) === 'string') ? { 'object.name': params.object.name } : undefined)
             }, {
                 projection: { _id: 1 }
             })
@@ -455,14 +453,14 @@ class MongoRepository {
      * タスク未エクスポートの取引をひとつ取得してエクスポートを開始する
      */
     startExportTasks(params) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            return this.transactionModel.findOneAndUpdate(Object.assign(Object.assign(Object.assign({}, (params.project !== undefined)
-                ? {
-                    'project.id': {
-                        $eq: params.project.id
-                    }
-                } : undefined), (params.typeOf !== undefined && params.typeOf !== null && Array.isArray(params.typeOf.$in))
-                ? { typeOf: { $in: params.typeOf.$in } } : undefined), { status: params.status, tasksExportationStatus: factory.transactionTasksExportationStatus.Unexported }), { tasksExportationStatus: factory.transactionTasksExportationStatus.Exporting }, { new: true })
+            const typeOfIn = (_a = params.typeOf) === null || _a === void 0 ? void 0 : _a.$in;
+            return this.transactionModel.findOneAndUpdate(Object.assign(Object.assign(Object.assign(Object.assign({}, (params.project !== undefined) ? { 'project.id': { $eq: params.project.id } } : undefined), (Array.isArray(typeOfIn)) ? { typeOf: { $in: typeOfIn } } : undefined), { status: params.status, tasksExportationStatus: factory.transactionTasksExportationStatus.Unexported }), (typeof params.id === 'string') ? { _id: { $eq: params.id } } : undefined), { tasksExportationStatus: factory.transactionTasksExportationStatus.Exporting }, { new: true })
+                .select({
+                _id: 1,
+                typeOf: 1
+            })
                 .exec()
                 // tslint:disable-next-line:no-null-keyword
                 .then((doc) => (doc === null) ? null : doc.toObject());
@@ -494,7 +492,7 @@ class MongoRepository {
      */
     setTasksExportedById(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.transactionModel.findByIdAndUpdate(params.id, {
+            yield this.transactionModel.updateOne({ _id: { $eq: params.id } }, {
                 tasksExportationStatus: factory.transactionTasksExportationStatus.Exported,
                 tasksExportedAt: new Date()
             })

package/lib/chevre/service/assetTransaction.d.ts

@@ -3,7 +3,6 @@
  */
 import * as factory from '../factory';
 import { MongoRepository as AssetTransactionRepo } from '../repo/assetTransaction';
-import { MongoRepository as ProjectRepo } from '../repo/project';
 import { MongoRepository as TaskRepo } from '../repo/task';
 import * as CancelReservationTransactionService from './assetTransaction/cancelReservation';
 import * as MoneyTransferTransactionService from './assetTransaction/moneyTransfer';
@@ -30,7 +29,6 @@ export declare function exportTasks<T extends factory.assetTransactionType>(para
         $in: T[];
     };
 }): (repos: {
-    project: ProjectRepo;
     task: TaskRepo;
     assetTransaction: AssetTransactionRepo;
 }) => Promise<{

package/lib/chevre/service/assetTransaction.js

@@ -32,7 +32,6 @@ exports.reserve = ReserveTransactionService;
 function exportTasks(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         const transaction = yield repos.assetTransaction.startExportTasks({
-            // project: params.project,
             typeOf: params.typeOf,
             status: params.status
         });

package/lib/chevre/service/transaction.d.ts

@@ -45,6 +45,7 @@ export declare function exportTasks<T extends factory.transactionType>(params: {
     typeOf?: {
         $in: T[];
     };
+    id?: string;
 }): IExportTasksOperation<void>;
 /**
  * 取引に関わるリソースを削除する

package/lib/chevre/service/transaction.js

@@ -77,15 +77,10 @@ exports.updateAgent = updateAgent;
  */
 function exportTasks(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const transaction = yield repos.transaction.startExportTasks({
-            project: params.project,
-            typeOf: params.typeOf,
-            status: params.status
-        });
+        const transaction = yield repos.transaction.startExportTasks(Object.assign({ project: params.project, typeOf: params.typeOf, status: params.status }, (typeof params.id === 'string') ? { id: params.id } : undefined));
         if (transaction === null) {
             return;
         }
-        // let tasks: factory.task.ITask<factory.taskName>[] = [];
         // 失敗してもここでは戻さない(RUNNINGのまま待機)
         switch (transaction.typeOf) {
             case factory.transactionType.MoneyTransfer:
@@ -109,7 +104,6 @@ function exportTasks(params) {
             default:
         }
         yield repos.transaction.setTasksExportedById({ id: transaction.id });
-        // return tasks;
     });
 }
 exports.exportTasks = exportTasks;

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