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

package/lib/chevre/repo/assetTransaction.js

@@ -13,6 +13,8 @@ exports.MongoRepository = void 0;
 const moment = require("moment");
 const assetTransaction_1 = require("./mongoose/schemas/assetTransaction");
 const factory = require("../factory");
+const assetTransaction_2 = require("../eventEmitter/assetTransaction");
+const settings_1 = require("../settings");
 /**
  * 資産取引リポジトリ
  */
@@ -22,7 +24,7 @@ class MongoRepository {
     }
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     static CREATE_MONGO_CONDITIONS(params) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21;
         const andConditions = [
             {
                 typeOf: params.typeOf
@@ -132,15 +134,18 @@ class MongoRepository {
                 const objectPaymentMethodIdEq4refund = (_j = (_h = params.object) === null || _h === void 0 ? void 0 : _h.paymentMethodId) === null || _j === void 0 ? void 0 : _j.$eq;
                 if (typeof objectPaymentMethodIdEq4refund === 'string') {
                     andConditions.push({
-                        'object.paymentMethodId': {
-                            $exists: true,
-                            $eq: objectPaymentMethodIdEq4refund
-                        }
+                        'object.paymentMethodId': { $exists: true, $eq: objectPaymentMethodIdEq4refund }
+                    });
+                }
+                const objectPaymentMethodIdIn4refund = (_l = (_k = params.object) === null || _k === void 0 ? void 0 : _k.paymentMethodId) === null || _l === void 0 ? void 0 : _l.$in;
+                if (Array.isArray(objectPaymentMethodIdIn4refund)) {
+                    andConditions.push({
+                        'object.paymentMethodId': { $exists: true, $in: objectPaymentMethodIdIn4refund }
                     });
                 }
                 break;
             case factory.assetTransactionType.MoneyTransfer:
-                const fromLocationIdentifierEq = (_m = (_l = (_k = params.object) === null || _k === void 0 ? void 0 : _k.fromLocation) === null || _l === void 0 ? void 0 : _l.identifier) === null || _m === void 0 ? void 0 : _m.$eq;
+                const fromLocationIdentifierEq = (_p = (_o = (_m = params.object) === null || _m === void 0 ? void 0 : _m.fromLocation) === null || _o === void 0 ? void 0 : _o.identifier) === null || _p === void 0 ? void 0 : _p.$eq;
                 if (typeof fromLocationIdentifierEq === 'string') {
                     andConditions.push({
                         'object.fromLocation.identifier': {
@@ -149,7 +154,7 @@ class MongoRepository {
                         }
                     });
                 }
-                const toLocationIdentifierEq = (_q = (_p = (_o = params.object) === null || _o === void 0 ? void 0 : _o.toLocation) === null || _p === void 0 ? void 0 : _p.identifier) === null || _q === void 0 ? void 0 : _q.$eq;
+                const toLocationIdentifierEq = (_s = (_r = (_q = params.object) === null || _q === void 0 ? void 0 : _q.toLocation) === null || _r === void 0 ? void 0 : _r.identifier) === null || _s === void 0 ? void 0 : _s.$eq;
                 if (typeof toLocationIdentifierEq === 'string') {
                     andConditions.push({
                         'object.toLocation.identifier': {
@@ -158,7 +163,7 @@ class MongoRepository {
                         }
                     });
                 }
-                const pendingTransactionIdentifierEq = (_t = (_s = (_r = params.object) === null || _r === void 0 ? void 0 : _r.pendingTransaction) === null || _s === void 0 ? void 0 : _s.identifier) === null || _t === void 0 ? void 0 : _t.$eq;
+                const pendingTransactionIdentifierEq = (_v = (_u = (_t = params.object) === null || _t === void 0 ? void 0 : _t.pendingTransaction) === null || _u === void 0 ? void 0 : _u.identifier) === null || _v === void 0 ? void 0 : _v.$eq;
                 if (typeof pendingTransactionIdentifierEq === 'string') {
                     andConditions.push({
                         'object.pendingTransaction.identifier': {
@@ -171,7 +176,25 @@ class MongoRepository {
             case factory.assetTransactionType.CancelReservation:
                 break;
             case factory.assetTransactionType.Reserve:
-                const objectReservationNumberEq = (_v = (_u = params.object) === null || _u === void 0 ? void 0 : _u.reservationNumber) === null || _v === void 0 ? void 0 : _v.$eq;
+                const objectReservationForIdEq = (_y = (_x = (_w = params.object) === null || _w === void 0 ? void 0 : _w.reservationFor) === null || _x === void 0 ? void 0 : _x.id) === null || _y === void 0 ? void 0 : _y.$eq;
+                if (typeof objectReservationForIdEq === 'string') {
+                    andConditions.push({
+                        'object.reservationFor.id': {
+                            $exists: true,
+                            $eq: objectReservationForIdEq
+                        }
+                    });
+                }
+                const objectReservationNumberIn = (_0 = (_z = params.object) === null || _z === void 0 ? void 0 : _z.reservationNumber) === null || _0 === void 0 ? void 0 : _0.$in;
+                if (Array.isArray(objectReservationNumberIn)) {
+                    andConditions.push({
+                        'object.reservationNumber': {
+                            $exists: true,
+                            $in: objectReservationNumberIn
+                        }
+                    });
+                }
+                const objectReservationNumberEq = (_2 = (_1 = params.object) === null || _1 === void 0 ? void 0 : _1.reservationNumber) === null || _2 === void 0 ? void 0 : _2.$eq;
                 if (typeof objectReservationNumberEq === 'string') {
                     andConditions.push({
                         'object.reservationNumber': {
@@ -180,19 +203,17 @@ class MongoRepository {
                         }
                     });
                 }
+                const objectSubReservationIdIn = (_5 = (_4 = (_3 = params.object) === null || _3 === void 0 ? void 0 : _3.reservations) === null || _4 === void 0 ? void 0 : _4.id) === null || _5 === void 0 ? void 0 : _5.$in;
+                if (Array.isArray(objectSubReservationIdIn)) {
+                    andConditions.push({
+                        'object.subReservation.id': {
+                            $exists: true,
+                            $in: objectSubReservationIdIn
+                        }
+                    });
+                }
                 if (params.object !== undefined) {
                     if (params.object.reservations !== undefined) {
-                        if (params.object.reservations.id !== undefined) {
-                            if (Array.isArray(params.object.reservations.id.$in)) {
-                                andConditions.push({
-                                    // 'object.reservations.id': {
-                                    'object.subReservation.id': {
-                                        $exists: true,
-                                        $in: params.object.reservations.id.$in
-                                    }
-                                });
-                            }
-                        }
                         if (params.object.reservations.reservationNumber !== undefined) {
                             if (Array.isArray(params.object.reservations.reservationNumber.$in)) {
                                 andConditions.push({
@@ -217,9 +238,27 @@ class MongoRepository {
                         }
                     }
                 }
+                const objectUnderNameIdEq = (_8 = (_7 = (_6 = params.object) === null || _6 === void 0 ? void 0 : _6.underName) === null || _7 === void 0 ? void 0 : _7.id) === null || _8 === void 0 ? void 0 : _8.$eq;
+                if (typeof objectUnderNameIdEq === 'string') {
+                    andConditions.push({
+                        'object.underName.id': {
+                            $exists: true,
+                            $eq: objectUnderNameIdEq
+                        }
+                    });
+                }
+                const objectSubReservationSeatNumberEq = (_13 = (_12 = (_11 = (_10 = (_9 = params.object) === null || _9 === void 0 ? void 0 : _9.reservations) === null || _10 === void 0 ? void 0 : _10.reservedTicket) === null || _11 === void 0 ? void 0 : _11.ticketedSeat) === null || _12 === void 0 ? void 0 : _12.seatNumber) === null || _13 === void 0 ? void 0 : _13.$eq;
+                if (typeof objectSubReservationSeatNumberEq === 'string') {
+                    andConditions.push({
+                        'object.subReservation.reservedTicket.ticketedSeat.seatNumber': {
+                            $exists: true,
+                            $eq: objectSubReservationSeatNumberEq
+                        }
+                    });
+                }
                 break;
             case factory.assetTransactionType.RegisterService:
-                const objectItemOfferedServiceOutputIdentifierEq = (_z = (_y = (_x = (_w = params.object) === null || _w === void 0 ? void 0 : _w.itemOffered) === null || _x === void 0 ? void 0 : _x.serviceOutput) === null || _y === void 0 ? void 0 : _y.identifier) === null || _z === void 0 ? void 0 : _z.$eq;
+                const objectItemOfferedServiceOutputIdentifierEq = (_17 = (_16 = (_15 = (_14 = params.object) === null || _14 === void 0 ? void 0 : _14.itemOffered) === null || _15 === void 0 ? void 0 : _15.serviceOutput) === null || _16 === void 0 ? void 0 : _16.identifier) === null || _17 === void 0 ? void 0 : _17.$eq;
                 if (typeof objectItemOfferedServiceOutputIdentifierEq === 'string') {
                     andConditions.push({
                         'object.itemOffered.serviceOutput.identifier': {
@@ -228,7 +267,7 @@ class MongoRepository {
                         }
                     });
                 }
-                const objectItemOfferedServiceOutputIdentifierIn = (_3 = (_2 = (_1 = (_0 = params.object) === null || _0 === void 0 ? void 0 : _0.itemOffered) === null || _1 === void 0 ? void 0 : _1.serviceOutput) === null || _2 === void 0 ? void 0 : _2.identifier) === null || _3 === void 0 ? void 0 : _3.$in;
+                const objectItemOfferedServiceOutputIdentifierIn = (_21 = (_20 = (_19 = (_18 = params.object) === null || _18 === void 0 ? void 0 : _18.itemOffered) === null || _19 === void 0 ? void 0 : _19.serviceOutput) === null || _20 === void 0 ? void 0 : _20.identifier) === null || _21 === void 0 ? void 0 : _21.$in;
                 if (Array.isArray(objectItemOfferedServiceOutputIdentifierIn)) {
                     andConditions.push({
                         'object.itemOffered.serviceOutput.identifier': {
@@ -247,7 +286,9 @@ class MongoRepository {
      */
     start(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.transactionModel.create(Object.assign(Object.assign({}, params), { typeOf: params.typeOf, status: factory.transactionStatusType.InProgress, startDate: new Date(), endDate: undefined, tasksExportationStatus: factory.transactionTasksExportationStatus.Unexported }))
+            return this.transactionModel.create(Object.assign(Object.assign({}, params), { typeOf: params.typeOf, status: factory.transactionStatusType.InProgress, startDate: new Date(), endDate: undefined, tasksExportAction: {
+                    actionStatus: factory.actionStatusType.PotentialActionStatus
+                }, tasksExportationStatus: factory.transactionTasksExportationStatus.Unexported }))
                 .then((doc) => doc.toObject());
         });
     }
@@ -277,26 +318,24 @@ class MongoRepository {
             return doc.toObject();
         });
     }
-    /**
-     * 取引を確定する
-     */
     addReservations(params) {
+        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
-            }, {
-                'object.acceptedOffer': params.object.acceptedOffer,
+                _id: { $eq: params.id },
+                typeOf: { $eq: params.typeOf },
+                status: { $eq: factory.transactionStatusType.InProgress }
+            }, Object.assign({ 'object.acceptedOffer': params.object.acceptedOffer, 
                 // 念のため残す(2021/10/14)が、そのうち削除
                 // 冗長なので削除(2021/10/19～)
                 // 'object.event': params.object.reservationFor,
-                'object.reservationFor': params.object.reservationFor,
+                'object.reservationFor': params.object.reservationFor, 
                 // 念のため残す(2021/10/14)が、そのうち削除
                 // 冗長なので削除(2021/10/19～)
                 // 'object.reservations': params.object.subReservation,
-                'object.subReservation': params.object.subReservation
-            }, { new: true })
+                'object.subReservation': params.object.subReservation }, (typeof ((_a = params.object.issuedThrough) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string')
+                ? { 'object.issuedThrough': params.object.issuedThrough }
+                : undefined), { new: true })
                 .exec();
             if (doc === null) {
                 throw new factory.errors.NotFound(this.transactionModel.modelName);
@@ -308,36 +347,40 @@ class MongoRepository {
      * 取引を確定する
      */
     confirm(params) {
+        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
-            }, {
-                status: factory.transactionStatusType.Confirmed,
-                endDate: new Date(),
-                result: params.result,
-                potentialActions: params.potentialActions // resultを更新
-            }, { new: true })
+                _id: { $eq: params.id },
+                typeOf: { $eq: params.typeOf },
+                status: { $eq: factory.transactionStatusType.InProgress }
+            }, Object.assign({ status: factory.transactionStatusType.Confirmed, endDate: new Date(), result: params.result, potentialActions: params.potentialActions }, (typeof ((_b = (_a = params.object) === null || _a === void 0 ? void 0 : _a.underName) === null || _b === void 0 ? void 0 : _b.typeOf) === 'string')
+                ? { 'object.underName': params.object.underName }
+                : undefined), {
+                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');
+                    throw new factory.errors.Argument('Transaction id', `Transaction ${transaction.typeOf} ${transaction.transactionNumber} already expired`);
                 }
                 else if (transaction.status === factory.transactionStatusType.Canceled) {
-                    throw new factory.errors.Argument('Transaction id', 'Transaction already canceled');
+                    throw new factory.errors.Argument('Transaction id', `Transaction ${transaction.typeOf} ${transaction.transactionNumber} already canceled`);
                 }
                 else {
                     throw new factory.errors.NotFound(this.transactionModel.modelName);
                 }
             }
-            return doc.toObject();
+            assetTransaction_2.assetTransactionEventEmitter.emitAssetTransactionStatusChanged({
+                id: params.id,
+                typeOf: params.typeOf,
+                status: factory.transactionStatusType.Confirmed
+            });
         });
     }
     /**
@@ -345,23 +388,42 @@ class MongoRepository {
      */
     startAndConfirm(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.transactionModel.create(Object.assign(Object.assign({ _id: params.id, typeOf: params.typeOf }, params), { startDate: new Date(), status: factory.transactionStatusType.Confirmed, tasksExportationStatus: factory.transactionTasksExportationStatus.Unexported, endDate: new Date(), result: params.result, potentialActions: params.potentialActions }))
+            const startDate = new Date();
+            const confirmedTransaction = yield this.transactionModel.create(Object.assign(Object.assign({}, params), { _id: params.id, typeOf: params.typeOf, startDate, status: factory.transactionStatusType.Confirmed, tasksExportAction: {
+                    actionStatus: factory.actionStatusType.PotentialActionStatus
+                }, tasksExportationStatus: factory.transactionTasksExportationStatus.Unexported, endDate: startDate, result: params.result, potentialActions: params.potentialActions }))
                 .then((doc) => doc.toObject());
+            assetTransaction_2.assetTransactionEventEmitter.emitAssetTransactionStatusChanged({
+                id: params.id,
+                typeOf: params.typeOf,
+                status: factory.transactionStatusType.Confirmed
+            });
+            return confirmedTransaction;
         });
     }
     /**
      * タスク未エクスポートの取引をひとつ取得してエクスポートを開始する
      */
     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 })
+            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: { $eq: params.status }, tasksExportationStatus: { $eq: factory.transactionTasksExportationStatus.Unexported } }), (typeof params.id === 'string') ? { _id: { $eq: params.id } } : undefined), {
+                'tasksExportAction.actionStatus': factory.actionStatusType.ActiveActionStatus,
+                'tasksExportAction.agent': { name: params.tasksExportAction.agent.name },
+                'tasksExportAction.startDate': new Date(),
+                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());
@@ -374,17 +436,74 @@ 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: settings_1.MONGO_MAX_TIME_MS })
+                .exec();
+            if (reexportingTransactions.length > 0) {
+                for (const reexportingTransaction of reexportingTransactions) {
+                    yield this.transactionModel.updateOne({
+                        _id: { $eq: reexportingTransaction.id },
+                        tasksExportationStatus: { $eq: factory.transactionTasksExportationStatus.Exporting }
+                    }, {
+                        tasksExportAction: {
+                            actionStatus: factory.actionStatusType.PotentialActionStatus
+                        },
+                        tasksExportationStatus: factory.transactionTasksExportationStatus.Unexported
+                    })
+                        .exec();
+                    assetTransaction_2.assetTransactionEventEmitter.emitAssetTransactionStatusChanged({
+                        id: reexportingTransaction.id,
+                        typeOf: reexportingTransaction.typeOf,
+                        status: reexportingTransaction.status
+                    });
+                }
+            }
+        });
+    }
+    /**
+     * タスクエクスポートの遅延している取引について明示的にemitTransactionStatusChangedを実行する
+     */
+    exportTasks(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const delayedTransactions = yield this.transactionModel.find({
+                status: { $in: params.status.$in },
+                tasksExportationStatus: { $eq: factory.transactionTasksExportationStatus.Unexported },
+                endDate: {
+                    $exists: true,
+                    $lt: moment(params.now)
+                        .add(-params.delayInSeconds, 'seconds')
+                        .toDate()
+                }
+            })
+                .select({
+                _id: 1,
+                typeOf: 1,
+                status: 1
+            })
+                .setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
                 .exec();
+            if (delayedTransactions.length > 0) {
+                delayedTransactions.forEach((delayedTransaction) => {
+                    assetTransaction_2.assetTransactionEventEmitter.emitAssetTransactionStatusChanged({
+                        id: delayedTransaction.id,
+                        typeOf: delayedTransaction.typeOf,
+                        status: delayedTransaction.status
+                    });
+                });
+            }
+            return delayedTransactions;
         });
     }
     /**
@@ -393,10 +512,15 @@ class MongoRepository {
      */
     setTasksExportedById(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.transactionModel.findByIdAndUpdate(params.id, {
+            const endDate = new Date();
+            yield this.transactionModel.updateOne({
+                _id: { $eq: params.id },
+                tasksExportationStatus: { $eq: factory.transactionTasksExportationStatus.Exporting }
+            }, {
                 tasksExportationStatus: factory.transactionTasksExportationStatus.Exported,
-                tasksExportedAt: moment()
-                    .toDate()
+                tasksExportedAt: endDate,
+                'tasksExportAction.actionStatus': factory.actionStatusType.CompletedActionStatus,
+                'tasksExportAction.endDate': endDate
             })
                 .exec();
         });
@@ -406,15 +530,36 @@ class MongoRepository {
      */
     makeExpired(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            // ステータスと期限を見て更新
-            yield this.transactionModel.updateMany({
-                status: factory.transactionStatusType.InProgress,
-                expires: { $lt: params.expires }
-            }, {
-                status: factory.transactionStatusType.Expired,
-                endDate: new Date()
+            // IDをemitしたいのでまずリスト検索(2023-04-27~)
+            const expiringTransactions = yield this.transactionModel.find({
+                status: { $eq: factory.transactionStatusType.InProgress },
+                expires: { $lt: params.expires.$lt }
+            })
+                .select({
+                _id: 1,
+                typeOf: 1
             })
+                .setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
                 .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.$lt }
+                }, {
+                    status: factory.transactionStatusType.Expired,
+                    endDate: new Date()
+                })
+                    .exec();
+                expiringTransactions.forEach((expiringTransaction) => {
+                    assetTransaction_2.assetTransactionEventEmitter.emitAssetTransactionStatusChanged({
+                        id: expiringTransaction.id,
+                        typeOf: expiringTransaction.typeOf,
+                        status: factory.transactionStatusType.Expired
+                    });
+                });
+            }
         });
     }
     /**
@@ -422,19 +567,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 });
                 }
@@ -448,39 +592,64 @@ 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');
+                    throw new factory.errors.Argument('Transaction id', `Transaction ${transaction.typeOf} ${transaction.transactionNumber} already expired`);
                 }
                 else if (transaction.status === factory.transactionStatusType.Confirmed) {
-                    throw new factory.errors.Argument('Transaction id', 'Confirmed transaction unable to cancel');
+                    throw new factory.errors.Argument('Transaction id', `Confirmed transaction ${transaction.typeOf} ${transaction.transactionNumber} unable to cancel`);
                 }
                 else {
                     throw new factory.errors.NotFound(this.transactionModel.modelName);
                 }
             }
-            return doc.toObject();
+            else {
+                transaction = doc.toObject();
+            }
+            assetTransaction_2.assetTransactionEventEmitter.emitAssetTransactionStatusChanged({
+                id: transaction.id,
+                typeOf: params.typeOf,
+                status: factory.transactionStatusType.Canceled
+            });
+            return transaction;
         });
     }
     count(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = MongoRepository.CREATE_MONGO_CONDITIONS(params);
             return this.transactionModel.countDocuments({ $and: conditions })
-                .setOptions({ maxTimeMS: 10000 })
+                .setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
                 .exec();
         });
     }
     /**
      * 取引を検索する
      */
-    search(params, projection) {
+    search(params, inclusion, exclusion) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = MongoRepository.CREATE_MONGO_CONDITIONS(params);
+            let projection = {};
+            if (Array.isArray(inclusion) && inclusion.length > 0) {
+                inclusion.forEach((field) => {
+                    projection[field] = 1;
+                });
+            }
+            else {
+                projection = {
+                    __v: 0,
+                    createdAt: 0,
+                    updatedAt: 0
+                };
+                if (Array.isArray(exclusion) && exclusion.length > 0) {
+                    exclusion.forEach((field) => {
+                        projection[field] = 0;
+                    });
+                }
+            }
             const query = this.transactionModel.find((conditions.length > 0) ? { $and: conditions } : {})
-                .select(Object.assign({ __v: 0, createdAt: 0, updatedAt: 0 }, projection));
+                .select(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)
@@ -491,7 +660,7 @@ class MongoRepository {
             if (((_a = params.sort) === null || _a === void 0 ? void 0 : _a.startDate) !== undefined) {
                 query.sort({ startDate: params.sort.startDate });
             }
-            return query.setOptions({ maxTimeMS: 10000 })
+            return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
                 .exec()
                 .then((docs) => docs.map((doc) => doc.toObject()));
         });
@@ -523,9 +692,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/categoryCode.d.ts

@@ -35,7 +35,7 @@ export declare class MongoRepository {
     /**
      * 検索
      */
-    search(params: factory.categoryCode.ISearchConditions): Promise<factory.categoryCode.ICategoryCode[]>;
+    search(params: factory.categoryCode.ISearchConditions, inclusion: string[], exclusion: string[]): Promise<factory.categoryCode.ICategoryCode[]>;
     findById(params: {
         id: string;
     }): Promise<factory.categoryCode.ICategoryCode>;