@chevre/domain 21.2.0-alpha.5 → 21.2.0-alpha.51

package/lib/chevre/repo/transaction.js

@@ -12,17 +12,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MongoRepository = void 0;
 const moment = require("moment");
 const factory = require("../factory");
-const onIndexCreated_1 = require("./mongoose/onIndexCreated");
 const transaction_1 = require("./mongoose/schemas/transaction");
+const transaction_2 = require("../eventEmitter/transaction");
 /**
  * 取引リポジトリ
  */
 class MongoRepository {
     constructor(connection) {
         this.transactionModel = connection.model(transaction_1.modelName, transaction_1.schema);
-        if (connection.get('autoIndex') === true) {
-            this.transactionModel.on(onIndexCreated_1.INDEX_EVENT, onIndexCreated_1.onIndexCreated);
-        }
     }
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     static CREATE_MONGO_CONDITIONS(params) {
@@ -267,7 +264,9 @@ class MongoRepository {
             else {
                 expires = params.expires;
             }
-            return this.transactionModel.create(Object.assign(Object.assign({}, params), { typeOf: params.typeOf, status: factory.transactionStatusType.InProgress, startDate, endDate: undefined, expires, tasksExportationStatus: factory.transactionTasksExportationStatus.Unexported }))
+            return this.transactionModel.create(Object.assign(Object.assign({}, params), { typeOf: params.typeOf, status: factory.transactionStatusType.InProgress, startDate, endDate: undefined, expires, tasksExportAction: {
+                    actionStatus: factory.actionStatusType.PotentialActionStatus
+                }, tasksExportationStatus: factory.transactionTasksExportationStatus.Unexported }))
                 .then((doc) => doc.toObject());
         });
     }
@@ -276,10 +275,29 @@ class MongoRepository {
      */
     findById(params) {
         return __awaiter(this, void 0, void 0, function* () {
+            let projection = {};
+            if (Array.isArray(params.inclusion) && params.inclusion.length > 0) {
+                params.inclusion.forEach((field) => {
+                    projection[field] = 1;
+                });
+            }
+            else {
+                projection = {
+                    __v: 0,
+                    createdAt: 0,
+                    updatedAt: 0
+                };
+                if (Array.isArray(params.exclusion) && params.exclusion.length > 0) {
+                    params.exclusion.forEach((field) => {
+                        projection[field] = 0;
+                    });
+                }
+            }
             const doc = yield this.transactionModel.findOne({
                 _id: { $eq: params.id },
                 typeOf: { $eq: params.typeOf }
             })
+                .select(projection)
                 .exec();
             if (doc === null) {
                 throw new factory.errors.NotFound(this.transactionModel.modelName);
@@ -295,7 +313,9 @@ class MongoRepository {
             const doc = yield this.transactionModel.findOne({
                 _id: { $eq: params.id },
                 typeOf: { $eq: params.typeOf },
-                status: { $eq: factory.transactionStatusType.InProgress }
+                status: { $eq: factory.transactionStatusType.InProgress },
+                // expiresを条件に追加(2023-05-12~),
+                expires: { $gt: new Date() }
             })
                 .exec();
             if (doc === null) {
@@ -347,9 +367,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)
             }, {
@@ -367,9 +387,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
@@ -391,9 +411,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)
             }, {
@@ -411,9 +431,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(),
@@ -428,43 +448,49 @@ 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);
                 }
             }
-            // return doc.toObject();
+            transaction_2.transactionEventEmitter.emitTransactionStatusChanged({
+                id: params.id,
+                typeOf: params.typeOf,
+                status: factory.transactionStatusType.Confirmed
+            });
         });
     }
     /**
      * タスク未エクスポートの取引をひとつ取得してエクスポートを開始する
      */
     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 })
+            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: { $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());
@@ -477,17 +503,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: 10000 })
+                .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();
+                    transaction_2.transactionEventEmitter.emitTransactionStatusChanged({
+                        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: 10000 })
                 .exec();
+            if (delayedTransactions.length > 0) {
+                delayedTransactions.forEach((delayedTransaction) => {
+                    transaction_2.transactionEventEmitter.emitTransactionStatusChanged({
+                        id: delayedTransaction.id,
+                        typeOf: delayedTransaction.typeOf,
+                        status: delayedTransaction.status
+                    });
+                });
+            }
+            return delayedTransactions;
         });
     }
     /**
@@ -496,9 +579,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: new Date()
+                tasksExportedAt: endDate,
+                'tasksExportAction.actionStatus': factory.actionStatusType.CompletedActionStatus,
+                'tasksExportAction.endDate': endDate
             })
                 .exec();
         });
@@ -508,15 +597,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: 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.$lt }
+                }, {
+                    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
+                    });
+                });
+            }
         });
     }
     /**
@@ -541,11 +651,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');
@@ -557,7 +664,11 @@ class MongoRepository {
                     throw new factory.errors.NotFound(this.transactionModel.modelName);
                 }
             }
-            // return doc.toObject();
+            transaction_2.transactionEventEmitter.emitTransactionStatusChanged({
+                id: params.id,
+                typeOf: params.typeOf,
+                status: factory.transactionStatusType.Canceled
+            });
         });
     }
     count(params) {
@@ -615,9 +726,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 }
             })
@@ -632,7 +746,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();
@@ -641,7 +756,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/repo/trip.js

@@ -22,7 +22,6 @@ var __rest = (this && this.__rest) || function (s, e) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MongoRepository = void 0;
 const factory = require("../factory");
-const onIndexCreated_1 = require("./mongoose/onIndexCreated");
 const trip_1 = require("./mongoose/schemas/trip");
 /**
  * トリップリポジトリ
@@ -30,9 +29,6 @@ const trip_1 = require("./mongoose/schemas/trip");
 class MongoRepository {
     constructor(connection) {
         this.tripModel = connection.model(trip_1.modelName, trip_1.schema);
-        if (connection.get('autoIndex') === true) {
-            this.tripModel.on(onIndexCreated_1.INDEX_EVENT, onIndexCreated_1.onIndexCreated);
-        }
     }
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     static CREATE_MONGO_CONDITIONS(conditions) {

package/lib/chevre/service/aggregation/system.d.ts

@@ -4,97 +4,142 @@ import { MongoRepository as AssetTransactionRepo } from '../../repo/assetTransac
 import { MongoRepository as EventRepo } from '../../repo/event';
 import { MongoRepository as TasKRepo } from '../../repo/task';
 import { MongoRepository as TransactionRepo } from '../../repo/transaction';
+type AggregateDurationUnit = 'days' | 'hours';
 declare function aggregateEvent(params: {
-    aggregationDays: number;
+    aggregateDurationUnit: AggregateDurationUnit;
+    aggregationCount: number;
     excludedProjectId?: string;
 }): (repos: {
     agregation: AggregationRepo;
     event: EventRepo;
-}) => Promise<void>;
+}) => Promise<{
+    aggregationCount: number;
+    aggregateDuration: string;
+}>;
 /**
  * 注文取引集計
  */
 declare function aggregatePlaceOrder(params: {
-    aggregationDays: number;
+    aggregateDurationUnit: AggregateDurationUnit;
+    aggregationCount: number;
     excludedProjectId?: string;
     clientIds?: string[];
 }): (repos: {
     agregation: AggregationRepo;
     transaction: TransactionRepo;
-}) => Promise<void>;
+}) => Promise<{
+    aggregationCount: number;
+    aggregateDuration: string;
+}>;
 /**
  * 興行オファー承認アクション集計
  */
 declare function aggregateAuthorizeEventServiceOfferAction(params: {
-    aggregationDays: number;
+    aggregateDurationUnit: AggregateDurationUnit;
+    aggregationCount: number;
     excludedProjectId?: string;
 }): (repos: {
     agregation: AggregationRepo;
     action: ActionRepo;
-}) => Promise<void>;
+}) => Promise<{
+    aggregationCount: number;
+    aggregateDuration: string;
+}>;
 /**
  * 決済承認アクション集計
  */
 declare function aggregateAuthorizePaymentAction(params: {
-    aggregationDays: number;
+    aggregateDurationUnit: AggregateDurationUnit;
+    aggregationCount: number;
     excludedProjectId?: string;
 }): (repos: {
     agregation: AggregationRepo;
     action: ActionRepo;
-}) => Promise<void>;
+}) => Promise<{
+    aggregationCount: number;
+    aggregateDuration: string;
+}>;
 declare function aggregateAuthorizeOrderAction(params: {
-    aggregationDays: number;
+    aggregateDurationUnit: AggregateDurationUnit;
+    aggregationCount: number;
     excludedProjectId?: string;
 }): (repos: {
     agregation: AggregationRepo;
     action: ActionRepo;
-}) => Promise<void>;
+}) => Promise<{
+    aggregationCount: number;
+    aggregateDuration: string;
+}>;
 /**
  * 使用アクション集計
  */
 declare function aggregateUseAction(params: {
-    aggregationDays: number;
+    aggregateDurationUnit: AggregateDurationUnit;
+    aggregationCount: number;
     excludedProjectId?: string;
 }): (repos: {
     agregation: AggregationRepo;
     action: ActionRepo;
-}) => Promise<void>;
+}) => Promise<{
+    aggregationCount: number;
+    aggregateDuration: string;
+}>;
 declare function aggregateCheckMovieTicketAction(params: {
-    aggregationDays: number;
+    aggregateDurationUnit: AggregateDurationUnit;
+    aggregationCount: number;
     excludedProjectId?: string;
 }): (repos: {
     agregation: AggregationRepo;
     action: ActionRepo;
-}) => Promise<void>;
+}) => Promise<{
+    aggregationCount: number;
+    aggregateDuration: string;
+}>;
 declare function aggregatePayMovieTicketAction(params: {
-    aggregationDays: number;
+    aggregateDurationUnit: AggregateDurationUnit;
+    aggregationCount: number;
     excludedProjectId?: string;
 }): (repos: {
     agregation: AggregationRepo;
     action: ActionRepo;
-}) => Promise<void>;
+}) => Promise<{
+    aggregationCount: number;
+    aggregateDuration: string;
+}>;
 declare function aggregatePayTransaction(params: {
-    aggregationDays: number;
+    aggregateDurationUnit: AggregateDurationUnit;
+    aggregationCount: number;
     excludedProjectId?: string;
 }): (repos: {
     agregation: AggregationRepo;
     assetTransaction: AssetTransactionRepo;
-}) => Promise<void>;
+}) => Promise<{
+    aggregationCount: number;
+    aggregateDuration: string;
+}>;
 /**
  * 予約集計
  */
 declare function aggregateReserveTransaction(params: {
-    aggregationDays: number;
+    aggregateDurationUnit: AggregateDurationUnit;
+    aggregationCount: number;
     excludedProjectId?: string;
 }): (repos: {
     agregation: AggregationRepo;
     assetTransaction: AssetTransactionRepo;
-}) => Promise<void>;
+}) => Promise<{
+    aggregationCount: number;
+    aggregateDuration: string;
+}>;
 declare function aggregateTask(params: {
-    aggregationDays: number;
+    aggregateDurationUnit: AggregateDurationUnit;
+    aggregationCount: number;
     excludedProjectId?: string;
 }): (repos: {
     agregation: AggregationRepo;
     task: TasKRepo;
-}) => Promise<void>;
+}) => Promise<{
+    aggregationCount: number;
+    aggregateDuration: string;
+}>;
 export { aggregateAuthorizeEventServiceOfferAction, aggregateAuthorizeOrderAction, aggregateAuthorizePaymentAction, aggregateCheckMovieTicketAction, aggregateEvent, aggregatePayMovieTicketAction, aggregatePayTransaction, aggregatePlaceOrder, aggregateReserveTransaction, aggregateTask, aggregateUseAction };