@chevre/domain 21.2.0-alpha.17 → 21.2.0-alpha.19

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

@@ -0,0 +1,18 @@
+// 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.makeExpired({
+        expires: new Date()
+    });
+    console.log(result);
+}
+
+main()
+    .then(console.log)
+    .catch(console.error);

package/example/src/chevre/updateTransaction.ts

@@ -14,7 +14,7 @@ async function main() {
     };
 
     let now = moment();
-    await transactionRepo.findByIdAndUpdate({
+    await transactionRepo.findByIdAndUpdateInProgress({
         id: transactionId,
         update
     });

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

@@ -64,9 +64,6 @@ export declare class MongoRepository {
         typeOf: T;
         transactionNumber: string;
     }): Promise<factory.assetTransaction.ITransaction<T>>;
-    /**
-     * 取引を確定する
-     */
     addReservations(params: {
         typeOf: factory.assetTransactionType.Reserve;
         id: string;
@@ -80,7 +77,7 @@ export declare class MongoRepository {
         id: string;
         result: factory.assetTransaction.IResult<T>;
         potentialActions: factory.assetTransaction.IPotentialActions<T>;
-    }): Promise<factory.assetTransaction.ITransaction<T>>;
+    }): Promise<void>;
     /**
      * 取引を開始&確定
      */
@@ -160,7 +157,7 @@ export declare class MongoRepository {
     /**
      * 特定の取引を更新する(汎用)
      */
-    findByIdAndUpdate<T extends factory.assetTransactionType>(params: {
+    findByIdAndUpdateInProgress<T extends factory.assetTransactionType>(params: {
         id: string;
         update: any;
     }): Promise<factory.assetTransaction.ITransaction<T>>;

package/lib/chevre/repo/assetTransaction.js

@@ -277,15 +277,12 @@ class MongoRepository {
             return doc.toObject();
         });
     }
-    /**
-     * 取引を確定する
-     */
     addReservations(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const doc = yield this.transactionModel.findOneAndUpdate({
-                _id: params.id,
-                typeOf: params.typeOf,
-                status: factory.transactionStatusType.InProgress
+                _id: { $eq: params.id },
+                typeOf: { $eq: params.typeOf },
+                status: { $eq: factory.transactionStatusType.InProgress }
             }, {
                 'object.acceptedOffer': params.object.acceptedOffer,
                 // 念のため残す(2021/10/14)が、そのうち削除
@@ -310,22 +307,24 @@ class MongoRepository {
     confirm(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const doc = yield this.transactionModel.findOneAndUpdate({
-                _id: params.id,
-                typeOf: params.typeOf,
-                status: factory.transactionStatusType.InProgress
+                _id: { $eq: params.id },
+                typeOf: { $eq: params.typeOf },
+                status: { $eq: factory.transactionStatusType.InProgress }
             }, {
                 status: factory.transactionStatusType.Confirmed,
                 endDate: new Date(),
                 result: params.result,
                 potentialActions: params.potentialActions // resultを更新
-            }, { new: true })
+            }, {
+                new: true,
+                projection: { _id: 1 }
+            })
                 .exec();
             // NotFoundであれば取引状態確認
             if (doc === null) {
                 const transaction = yield this.findById({ typeOf: params.typeOf, id: params.id });
                 if (transaction.status === factory.transactionStatusType.Confirmed) {
-                    // すでに確定済の場合
-                    return transaction;
+                    // すでに確定済の場合スルー
                 }
                 else if (transaction.status === factory.transactionStatusType.Expired) {
                     throw new factory.errors.Argument('Transaction id', 'Transaction already expired');
@@ -337,7 +336,6 @@ class MongoRepository {
                     throw new factory.errors.NotFound(this.transactionModel.modelName);
                 }
             }
-            return doc.toObject();
         });
     }
     /**
@@ -355,8 +353,14 @@ class MongoRepository {
     startExportTasks(params) {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
+            switch (params.status) {
+                case factory.transactionStatusType.InProgress:
+                    throw new factory.errors.NotImplemented(`status "${params.status}" not implemented on startExportTasks`);
+                default:
+                // no op
+            }
             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 })
+            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: { $eq: params.status }, tasksExportationStatus: { $eq: factory.transactionTasksExportationStatus.Unexported } }), (typeof params.id === 'string') ? { _id: { $eq: params.id } } : undefined), { tasksExportationStatus: factory.transactionTasksExportationStatus.Exporting }, { new: true })
                 .select({
                 _id: 1,
                 typeOf: 1
@@ -374,7 +378,7 @@ class MongoRepository {
     reexportTasks(params) {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.transactionModel.updateMany({
-                tasksExportationStatus: factory.transactionTasksExportationStatus.Exporting,
+                tasksExportationStatus: { $eq: factory.transactionTasksExportationStatus.Exporting },
                 updatedAt: {
                     $lt: moment()
                         .add(-params.intervalInMinutes, 'minutes')
@@ -392,10 +396,12 @@ class MongoRepository {
      */
     setTasksExportedById(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.transactionModel.updateOne({ _id: { $eq: params.id } }, {
+            yield this.transactionModel.updateOne({
+                _id: { $eq: params.id },
+                tasksExportationStatus: { $eq: factory.transactionTasksExportationStatus.Exporting }
+            }, {
                 tasksExportationStatus: factory.transactionTasksExportationStatus.Exported,
-                tasksExportedAt: moment()
-                    .toDate()
+                tasksExportedAt: new Date()
             })
                 .exec();
         });
@@ -405,15 +411,29 @@ class MongoRepository {
      */
     makeExpired(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            // ステータスと期限を見て更新
-            yield this.transactionModel.updateMany({
-                status: factory.transactionStatusType.InProgress,
+            // IDをemitしたいのでまずリスト検索(2023-04-27~)
+            const expiringTransactions = yield this.transactionModel.find({
+                status: { $eq: factory.transactionStatusType.InProgress },
                 expires: { $lt: params.expires }
-            }, {
-                status: factory.transactionStatusType.Expired,
-                endDate: new Date()
             })
+                .select({
+                _id: 1,
+                typeOf: 1
+            })
+                .setOptions({ maxTimeMS: 10000 })
                 .exec();
+            if (expiringTransactions.length > 0) {
+                // ステータスと期限を見て更新
+                yield this.transactionModel.updateMany({
+                    _id: { $in: expiringTransactions.map((t) => t.id) },
+                    status: { $eq: factory.transactionStatusType.InProgress },
+                    expires: { $lt: params.expires }
+                }, {
+                    status: factory.transactionStatusType.Expired,
+                    endDate: new Date()
+                })
+                    .exec();
+            }
         });
     }
     /**
@@ -421,19 +441,18 @@ class MongoRepository {
      */
     cancel(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const endDate = moment()
-                .toDate();
+            const endDate = new Date();
             // 進行中ステータスの取引を中止する
-            const doc = yield this.transactionModel.findOneAndUpdate(Object.assign(Object.assign(Object.assign({ typeOf: params.typeOf }, (typeof params.id === 'string') ? { _id: params.id } : undefined), (typeof params.transactionNumber === 'string')
+            const doc = yield this.transactionModel.findOneAndUpdate(Object.assign(Object.assign(Object.assign({ typeOf: { $eq: params.typeOf } }, (typeof params.id === 'string') ? { _id: { $eq: params.id } } : undefined), (typeof params.transactionNumber === 'string')
                 ? { transactionNumber: { $exists: true, $eq: params.transactionNumber } }
-                : undefined), { status: factory.transactionStatusType.InProgress }), {
+                : undefined), { status: { $eq: factory.transactionStatusType.InProgress } }), {
                 status: factory.transactionStatusType.Canceled,
                 endDate: endDate
             }, { new: true })
                 .exec();
+            let transaction;
             // NotFoundであれば取引状態確認
             if (doc === null) {
-                let transaction;
                 if (typeof params.id === 'string') {
                     transaction = yield this.findById({ typeOf: params.typeOf, id: params.id });
                 }
@@ -447,8 +466,7 @@ class MongoRepository {
                     throw new factory.errors.ArgumentNull('Transaction ID or Transaction Number');
                 }
                 if (transaction.status === factory.transactionStatusType.Canceled) {
-                    // すでに中止済の場合
-                    return transaction;
+                    // すでに中止済の場合スルー
                 }
                 else if (transaction.status === factory.transactionStatusType.Expired) {
                     throw new factory.errors.Argument('Transaction id', 'Transaction already expired');
@@ -460,7 +478,10 @@ class MongoRepository {
                     throw new factory.errors.NotFound(this.transactionModel.modelName);
                 }
             }
-            return doc.toObject();
+            else {
+                transaction = doc.toObject();
+            }
+            return transaction;
         });
     }
     count(params) {
@@ -522,9 +543,12 @@ class MongoRepository {
     /**
      * 特定の取引を更新する(汎用)
      */
-    findByIdAndUpdate(params) {
+    findByIdAndUpdateInProgress(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.transactionModel.findOneAndUpdate({ _id: params.id }, params.update, { new: true })
+            return this.transactionModel.findOneAndUpdate({
+                _id: { $eq: params.id },
+                status: { $eq: factory.transactionStatusType.InProgress }
+            }, params.update, { new: true })
                 .exec()
                 .then((doc) => {
                 if (doc === null) {

package/lib/chevre/repo/mongoose/schemas/accountTransaction.js

@@ -33,7 +33,7 @@ const schema = new mongoose_1.Schema({
 }, {
     collection: 'accountTransactions',
     id: true,
-    read: 'primaryPreferred',
+    read: 'primary',
     writeConcern: writeConcern_1.writeConcern,
     strict: true,
     strictQuery: false,

package/lib/chevre/repo/mongoose/schemas/action.js

@@ -31,7 +31,7 @@ const schema = new mongoose_1.Schema({
 }, {
     collection: 'actions',
     id: true,
-    read: 'primaryPreferred',
+    read: 'primary',
     writeConcern: writeConcern_1.writeConcern,
     // true化(2022-11-12~)
     strict: true,

package/lib/chevre/repo/mongoose/schemas/assetTransaction.js

@@ -30,7 +30,7 @@ const schema = new mongoose_1.Schema({
 }, {
     collection: 'assetTransactions',
     id: true,
-    read: 'primaryPreferred',
+    read: 'primary',
     writeConcern: writeConcern_1.writeConcern,
     strict: true,
     strictQuery: false,

package/lib/chevre/repo/mongoose/schemas/authorization.js

@@ -18,7 +18,7 @@ const schema = new mongoose_1.Schema({
 }, {
     collection: 'authorizations',
     id: true,
-    read: 'primaryPreferred',
+    read: 'primary',
     writeConcern: writeConcern_1.writeConcern,
     strict: true,
     strictQuery: false,

package/lib/chevre/repo/mongoose/schemas/comments.js

@@ -29,7 +29,7 @@ const schema = new mongoose_1.Schema({
 }, {
     collection: 'comments',
     id: true,
-    read: 'primaryPreferred',
+    read: 'primary',
     writeConcern: writeConcern_1.writeConcern,
     strict: true,
     strictQuery: false,

package/lib/chevre/repo/mongoose/schemas/order.js

@@ -37,7 +37,7 @@ const schema = new mongoose_1.Schema({
 }, {
     collection: 'orders',
     id: true,
-    read: 'primaryPreferred',
+    read: 'primary',
     writeConcern: writeConcern_1.writeConcern,
     strict: true,
     strictQuery: false,

package/lib/chevre/repo/mongoose/schemas/ownershipInfo.js

@@ -24,7 +24,7 @@ const schema = new mongoose_1.Schema({
 }, {
     collection: 'ownershipInfos',
     id: true,
-    read: 'primaryPreferred',
+    read: 'primary',
     writeConcern: writeConcern_1.writeConcern,
     strict: true,
     strictQuery: false,

package/lib/chevre/repo/mongoose/schemas/reservation.js

@@ -48,7 +48,7 @@ const schema = new mongoose_1.Schema({
 }, {
     collection: 'reservations',
     id: true,
-    read: 'primaryPreferred',
+    read: 'primary',
     writeConcern: writeConcern_1.writeConcern,
     strict: true,
     strictQuery: false,

package/lib/chevre/repo/mongoose/schemas/serviceOutput.js

@@ -17,7 +17,7 @@ const schema = new mongoose_1.Schema({
 }, {
     collection: 'serviceOutputs',
     id: true,
-    read: 'primaryPreferred',
+    read: 'primary',
     writeConcern: writeConcern_1.writeConcern,
     strict: false,
     strictQuery: false,

package/lib/chevre/repo/mongoose/schemas/task.js

@@ -22,7 +22,7 @@ const schema = new mongoose_1.Schema({
 }, {
     collection: 'tasks',
     id: true,
-    read: 'primaryPreferred',
+    read: 'primary',
     writeConcern: writeConcern_1.writeConcern,
     strict: true,
     strictQuery: false,

package/lib/chevre/repo/mongoose/schemas/transaction.js

@@ -28,7 +28,7 @@ const schema = new mongoose_1.Schema({
 }, {
     collection: 'transactions',
     id: true,
-    read: 'primaryPreferred',
+    read: 'primary',
     writeConcern: writeConcern_1.writeConcern,
     strict: true,
     strictQuery: false,

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

@@ -151,7 +151,7 @@ export declare class MongoRepository {
     /**
      * 特定の取引を更新する(汎用)
      */
-    findByIdAndUpdate(params: {
+    findByIdAndUpdateInProgress(params: {
         id: string;
         update: {
             $set?: any;

package/lib/chevre/repo/transaction.js

@@ -344,9 +344,9 @@ class MongoRepository {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             const doc = yield this.transactionModel.findOneAndUpdate({
-                _id: params.id,
-                typeOf: params.typeOf,
-                status: factory.transactionStatusType.InProgress
+                _id: { $eq: params.id },
+                typeOf: { $eq: params.typeOf },
+                status: { $eq: factory.transactionStatusType.InProgress }
             }, {
                 $set: Object.assign(Object.assign({ 'agent.id': params.agent.id }, (typeof params.agent.name === 'string') ? { 'agent.name': params.agent.name } : undefined), (typeof ((_b = (_a = params.object) === null || _a === void 0 ? void 0 : _a.customer) === null || _b === void 0 ? void 0 : _b.typeOf) === 'string') ? { 'object.customer': params.object.customer } : undefined)
             }, {
@@ -364,9 +364,9 @@ class MongoRepository {
     updateExpires(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const doc = yield this.transactionModel.findOneAndUpdate({
-                _id: params.id,
-                typeOf: params.typeOf,
-                status: factory.transactionStatusType.InProgress
+                _id: { $eq: params.id },
+                typeOf: { $eq: params.typeOf },
+                status: { $eq: factory.transactionStatusType.InProgress }
             }, {
                 $set: {
                     expires: params.expires
@@ -388,9 +388,9 @@ class MongoRepository {
         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
+                _id: { $eq: params.id },
+                typeOf: { $eq: params.typeOf },
+                status: { $eq: factory.transactionStatusType.InProgress }
             }, {
                 $set: Object.assign({}, (typeof ((_a = params.object) === null || _a === void 0 ? void 0 : _a.name) === 'string') ? { 'object.name': params.object.name } : undefined)
             }, {
@@ -408,9 +408,9 @@ class MongoRepository {
     confirm(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const doc = yield this.transactionModel.findOneAndUpdate({
-                _id: params.id,
-                typeOf: params.typeOf,
-                status: factory.transactionStatusType.InProgress
+                _id: { $eq: params.id },
+                typeOf: { $eq: params.typeOf },
+                status: { $eq: factory.transactionStatusType.InProgress }
             }, {
                 status: factory.transactionStatusType.Confirmed,
                 endDate: new Date(),
@@ -425,23 +425,14 @@ class MongoRepository {
             // NotFoundであれば取引状態確認
             if (doc === null) {
                 const transaction = yield this.findById({ typeOf: params.typeOf, id: params.id });
-                // tslint:disable-next-line:no-single-line-block-comment
-                /* istanbul ignore next */
                 if (transaction.status === factory.transactionStatusType.Confirmed) {
-                    // すでに確定済の場合
-                    return;
-                    // tslint:disable-next-line:no-single-line-block-comment
-                    /* istanbul ignore next */
+                    // すでに確定済の場合スルー
                 }
                 else if (transaction.status === factory.transactionStatusType.Expired) {
                     throw new factory.errors.Argument('Transaction id', 'Already expired');
-                    // tslint:disable-next-line:no-single-line-block-comment
-                    /* istanbul ignore next */
                 }
                 else if (transaction.status === factory.transactionStatusType.Canceled) {
                     throw new factory.errors.Argument('Transaction id', 'Already canceled');
-                    // tslint:disable-next-line:no-single-line-block-comment
-                    /* istanbul ignore next */
                 }
                 else {
                     throw new factory.errors.NotFound(this.transactionModel.modelName);
@@ -460,8 +451,14 @@ class MongoRepository {
     startExportTasks(params) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
+            switch (params.status) {
+                case factory.transactionStatusType.InProgress:
+                    throw new factory.errors.NotImplemented(`status "${params.status}" not implemented on startExportTasks`);
+                default:
+                // no op
+            }
             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 })
+            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: { $eq: params.status }, tasksExportationStatus: { $eq: factory.transactionTasksExportationStatus.Unexported } }), (typeof params.id === 'string') ? { _id: { $eq: params.id } } : undefined), { tasksExportationStatus: factory.transactionTasksExportationStatus.Exporting }, { new: true })
                 .select({
                 _id: 1,
                 typeOf: 1
@@ -478,17 +475,51 @@ class MongoRepository {
      */
     reexportTasks(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.transactionModel.updateMany({
-                tasksExportationStatus: factory.transactionTasksExportationStatus.Exporting,
+            const reexportingTransactions = yield this.transactionModel.find({
+                tasksExportationStatus: { $eq: factory.transactionTasksExportationStatus.Exporting },
                 updatedAt: {
                     $lt: moment()
                         .add(-params.intervalInMinutes, 'minutes')
                         .toDate()
                 }
-            }, {
-                tasksExportationStatus: factory.transactionTasksExportationStatus.Unexported
             })
+                .select({
+                _id: 1,
+                typeOf: 1,
+                status: 1
+            })
+                .setOptions({ maxTimeMS: 10000 })
                 .exec();
+            if (reexportingTransactions.length > 0) {
+                for (const reexportingTransaction of reexportingTransactions) {
+                    yield this.transactionModel.updateOne({
+                        _id: { $eq: reexportingTransaction.id },
+                        tasksExportationStatus: { $eq: factory.transactionTasksExportationStatus.Exporting }
+                    }, {
+                        tasksExportationStatus: factory.transactionTasksExportationStatus.Unexported
+                    })
+                        .exec();
+                    transaction_2.transactionEventEmitter.emitTransactionStatusChanged({
+                        id: reexportingTransaction.id,
+                        typeOf: reexportingTransaction.typeOf,
+                        status: reexportingTransaction.status
+                    });
+                }
+            }
+            // await this.transactionModel.updateMany(
+            //     {
+            //         tasksExportationStatus: { $eq: factory.transactionTasksExportationStatus.Exporting },
+            //         updatedAt: {
+            //             $lt: moment()
+            //                 .add(-params.intervalInMinutes, 'minutes')
+            //                 .toDate()
+            //         }
+            //     },
+            //     {
+            //         tasksExportationStatus: factory.transactionTasksExportationStatus.Unexported
+            //     }
+            // )
+            //     .exec();
         });
     }
     /**
@@ -497,7 +528,10 @@ class MongoRepository {
      */
     setTasksExportedById(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.transactionModel.updateOne({ _id: { $eq: params.id } }, {
+            yield this.transactionModel.updateOne({
+                _id: { $eq: params.id },
+                tasksExportationStatus: { $eq: factory.transactionTasksExportationStatus.Exporting }
+            }, {
                 tasksExportationStatus: factory.transactionTasksExportationStatus.Exported,
                 tasksExportedAt: new Date()
             })
@@ -509,15 +543,36 @@ class MongoRepository {
      */
     makeExpired(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            // ステータスと期限を見て更新
-            yield this.transactionModel.updateMany({
-                status: factory.transactionStatusType.InProgress,
+            // IDをemitしたいのでまずリスト検索(2023-04-27~)
+            const expiringTransactions = yield this.transactionModel.find({
+                status: { $eq: factory.transactionStatusType.InProgress },
                 expires: { $lt: params.expires }
-            }, {
-                status: factory.transactionStatusType.Expired,
-                endDate: new Date()
             })
+                .select({
+                _id: 1,
+                typeOf: 1
+            })
+                .setOptions({ maxTimeMS: 10000 })
                 .exec();
+            if (expiringTransactions.length > 0) {
+                // ステータスと期限を見て更新
+                yield this.transactionModel.updateMany({
+                    _id: { $in: expiringTransactions.map((t) => t.id) },
+                    status: { $eq: factory.transactionStatusType.InProgress },
+                    expires: { $lt: params.expires }
+                }, {
+                    status: factory.transactionStatusType.Expired,
+                    endDate: new Date()
+                })
+                    .exec();
+                expiringTransactions.forEach((expiringTransaction) => {
+                    transaction_2.transactionEventEmitter.emitTransactionStatusChanged({
+                        id: expiringTransaction.id,
+                        typeOf: expiringTransaction.typeOf,
+                        status: factory.transactionStatusType.Expired
+                    });
+                });
+            }
         });
     }
     /**
@@ -542,11 +597,8 @@ class MongoRepository {
             // NotFoundであれば取引状態確認
             if (doc === null) {
                 const transaction = yield this.findById(params);
-                // tslint:disable-next-line:no-single-line-block-comment
-                /* istanbul ignore next */
                 if (transaction.status === factory.transactionStatusType.Canceled) {
-                    // すでに中止済の場合
-                    return;
+                    // すでに中止済の場合スルー
                 }
                 else if (transaction.status === factory.transactionStatusType.Expired) {
                     throw new factory.errors.Argument('Transaction id', 'Transaction already expired');
@@ -620,9 +672,12 @@ class MongoRepository {
     /**
      * 特定の取引を更新する(汎用)
      */
-    findByIdAndUpdate(params) {
+    findByIdAndUpdateInProgress(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.transactionModel.findOneAndUpdate({ _id: params.id }, params.update, {
+            yield this.transactionModel.findOneAndUpdate({
+                _id: { $eq: params.id },
+                status: { $eq: factory.transactionStatusType.InProgress }
+            }, params.update, {
                 // new: true,
                 projection: { _id: 1 }
             })
@@ -637,7 +692,8 @@ class MongoRepository {
     saveOrderNumberIfNotExist(params) {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.transactionModel.updateOne({
-                _id: params.id,
+                _id: { $eq: params.id },
+                status: { $eq: factory.transactionStatusType.InProgress },
                 'object.orderNumber': { $exists: false }
             }, { 'object.orderNumber': params.orderNumber })
                 .exec();
@@ -646,7 +702,8 @@ class MongoRepository {
     saveConfirmationNumberIfNotExist(params) {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.transactionModel.updateOne({
-                _id: params.id,
+                _id: { $eq: params.id },
+                status: { $eq: factory.transactionStatusType.InProgress },
                 'object.confirmationNumber': { $exists: false }
             }, { 'object.confirmationNumber': params.confirmationNumber })
                 .exec();

package/lib/chevre/service/assetTransaction/pay.js

@@ -281,7 +281,7 @@ function processAuthorizeMovieTicket(params, transaction, paymentServiceId, useC
 }
 function saveAuthorizeResult(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        return repos.assetTransaction.findByIdAndUpdate(params);
+        return repos.assetTransaction.findByIdAndUpdateInProgress(params);
     });
 }
 /**

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

@@ -194,7 +194,7 @@ function publishPaymentUrl(params) {
             paymentUrl: result.paymentUrl,
             issuedThrough: { id: (typeof startParams.object.id === 'string') ? startParams.object.id : '' }
         };
-        yield repos.transaction.findByIdAndUpdate({
+        yield repos.transaction.findByIdAndUpdateInProgress({
             id: transaction.id,
             update: { $set: { 'object.paymentMethods': paymentMethodByPaymentUrl } }
         });

package/lib/chevre/service/transaction/placeOrderInProgress.js

@@ -311,7 +311,7 @@ function authorizeAward(params) {
         if (Array.isArray(givePointAwardParams)) {
             const pointAwardIdentifiers = givePointAwardParams.map((g) => { var _a; return String((_a = g.object) === null || _a === void 0 ? void 0 : _a.identifier); });
             // 取引にインセンティブ付与アクションパラメータを保管する
-            yield repos.transaction.findByIdAndUpdate({
+            yield repos.transaction.findByIdAndUpdateInProgress({
                 id: transaction.id,
                 update: {
                     $set: {
@@ -339,7 +339,7 @@ function voidAward(params) {
         if (transaction.agent.id !== params.agent.id) {
             throw new factory.errors.Forbidden('Transaction not yours');
         }
-        yield repos.transaction.findByIdAndUpdate({
+        yield repos.transaction.findByIdAndUpdateInProgress({
             id: transaction.id,
             update: {
                 $unset: {

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

package/example/src/chevre/migrateMoneyTransferPendingTransactionIdentifier.ts

@@ -1,96 +0,0 @@
-// 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) };
-
-// tslint:disable-next-line:max-func-body-length
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
-
-    const accountTransactionRepo = new chevre.repository.AccountTransaction(mongoose.connection);
-    const assetTransactionRepo = new chevre.repository.AssetTransaction(mongoose.connection);
-
-    const cursor = assetTransactionRepo.getCursor(
-        {
-            'project.id': { $eq: project.id },
-            typeOf: { $eq: chevre.factory.assetTransactionType.MoneyTransfer },
-            startDate: {
-                $gte: moment('2023-02-17T15:00:00Z')
-                    .toDate()
-            }
-            // _id: { $eq: 'al6aff83w' }
-        },
-        {
-            // _id: 1,
-        }
-    );
-    console.log('assetTransactions found');
-
-    let i = 0;
-    let updateCount = 0;
-    // tslint:disable-next-line:max-func-body-length
-    await cursor.eachAsync(async (doc) => {
-        i += 1;
-        const moneyTransferTransaction: chevre.factory.assetTransaction.moneyTransfer.ITransaction = doc.toObject();
-
-        const description = moneyTransferTransaction.object.description;
-        if (description !== '鑑賞' && description !== '受け取り') {
-            console.log(
-                'no operation needed',
-                description,
-                moneyTransferTransaction.project.id,
-                moneyTransferTransaction.transactionNumber,
-                moneyTransferTransaction.startDate
-            );
-        } else {
-            const pendingTransactionIdentifier = moneyTransferTransaction.object.pendingTransaction?.identifier;
-            if (typeof pendingTransactionIdentifier === 'string' && pendingTransactionIdentifier.length > 0) {
-                console.log(
-                    'pendingTransactionIdentifier found',
-                    description,
-                    moneyTransferTransaction.project.id,
-                    moneyTransferTransaction.transactionNumber,
-                    moneyTransferTransaction.startDate
-                );
-            } else {
-                // 口座取引からidentifierを取得
-                const accountTransaction =
-                    await accountTransactionRepo.findByTransactionNumber({ transactionNumber: moneyTransferTransaction.transactionNumber });
-                console.log(
-                    'updating identifier...',
-                    accountTransaction.identifier,
-                    description,
-                    moneyTransferTransaction.project.id,
-                    moneyTransferTransaction.transactionNumber,
-                    moneyTransferTransaction.startDate
-                );
-                if (typeof accountTransaction.identifier === 'string') {
-                    await assetTransactionRepo.findByIdAndUpdate({
-                        id: moneyTransferTransaction.id,
-                        update: {
-                            'object.pendingTransaction.identifier': accountTransaction.identifier
-                        }
-                    });
-                }
-                console.log(
-                    'ientifier updated',
-                    accountTransaction.identifier,
-                    description,
-                    moneyTransferTransaction.project.id,
-                    moneyTransferTransaction.transactionNumber,
-                    moneyTransferTransaction.startDate
-                );
-                updateCount += 1;
-            }
-        }
-    });
-    console.log(i, 'assetTransactions checked');
-    console.log(updateCount, 'assetTransactions updated');
-}
-
-main()
-    .then()
-    .catch(console.error);