@chevre/domain 21.2.0-alpha.31 → 21.2.0-alpha.33

package/example/src/chevre/searchAbortedTasks.ts

@@ -9,18 +9,24 @@ async function main() {
 
     const taskRepo = new chevre.repository.Task(mongoose.connection);
 
-    const tasks = <chevre.factory.task.ITask<chevre.factory.taskName.Pay>[]>await taskRepo.search({
+    const tasks = <chevre.factory.task.ITask<chevre.factory.taskName.ConfirmPayTransaction>[]>await taskRepo.search({
         // limit: 100,
         // page: 1,
-        name: chevre.factory.taskName.Pay,
+        name: {
+            $in: [chevre.factory.taskName.ConfirmPayTransaction]
+            // $nin: [
+            //     chevre.factory.taskName.ImportEventsFromCOA,
+            //     chevre.factory.taskName.ImportEventCapacitiesFromCOA
+            // ]
+        },
         statuses: [chevre.factory.taskStatus.Aborted],
-        runsFrom: moment('2023-04-27T00:00:00Z')
+        runsFrom: moment('2023-05-02T22:00:00Z')
             .toDate(),
         sort: { runsAt: chevre.factory.sortType.Ascending }
     });
-    console.log(tasks.map((task) => `${task.project.id},${task.id},${moment(task.runsAt)
+    console.log(tasks.map((task) => `${task.project.id},${task.id},${task.name},${moment(task.runsAt)
         .tz('Asia/Tokyo')
-        .format('YYYY-MM-DDTHH:mm:ssZ')},"${task.data.object[0].paymentMethod.paymentMethodId}"`)
+        .format('YYYY-MM-DDTHH:mm:ssZ')},"${task.data.object[0]?.transactionNumber}"`)
         .join('\n'));
     console.log(tasks.length);
 }

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

@@ -9,7 +9,8 @@ async function main() {
     const transactionRepo = new chevre.repository.Transaction(mongoose.connection);
     const result = await transactionRepo.startExportTasks({
         typeOf: { $in: [chevre.factory.transactionType.PlaceOrder] },
-        status: chevre.factory.transactionStatusType.Confirmed
+        status: chevre.factory.transactionStatusType.Confirmed,
+        tasksExportAction: { agent: { name: 'xxx' } }
     });
     console.log(result);
 }

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

@@ -111,6 +111,13 @@ export declare class MongoRepository {
     reexportTasks(params: {
         intervalInMinutes: number;
     }): Promise<void>;
+    /**
+     * タスクエクスポートの遅延している取引について明示的にemitTransactionStatusChangedを実行する
+     */
+    exportTasks(params: {
+        now: Date;
+        delayInSeconds: number;
+    }): Promise<Pick<import("@chevre/factory/lib/assetTransaction/cancelReservation").ITransaction | import("@chevre/factory/lib/assetTransaction/moneyTransfer").ITransaction | import("@chevre/factory/lib/assetTransaction/reserve").ITransaction | import("@chevre/factory/lib/assetTransaction/pay").ITransaction | import("@chevre/factory/lib/assetTransaction/refund").ITransaction | import("@chevre/factory/lib/assetTransaction/registerService").ITransaction, "typeOf" | "id" | "status">[]>;
     /**
      * set task status exported by transaction id
      * IDでタスクをエクスポート済に変更する

package/lib/chevre/repo/assetTransaction.js

@@ -436,6 +436,46 @@ class MongoRepository {
             //     .exec();
         });
     }
+    /**
+     * タスクエクスポートの遅延している取引について明示的にemitTransactionStatusChangedを実行する
+     */
+    exportTasks(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const delayedTransactions = yield this.transactionModel.find({
+                status: {
+                    $in: [
+                        factory.transactionStatusType.Canceled,
+                        factory.transactionStatusType.Confirmed,
+                        factory.transactionStatusType.Expired
+                    ]
+                },
+                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) => {
+                    assetTransaction_2.assetTransactionEventEmitter.emitAssetTransactionStatusChanged({
+                        id: delayedTransaction.id,
+                        typeOf: delayedTransaction.typeOf,
+                        status: delayedTransaction.status
+                    });
+                });
+            }
+            return delayedTransactions;
+        });
+    }
     /**
      * set task status exported by transaction id
      * IDでタスクをエクスポート済に変更する

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

@@ -127,6 +127,13 @@ export declare class MongoRepository {
     reexportTasks(params: {
         intervalInMinutes: number;
     }): Promise<void>;
+    /**
+     * タスクエクスポートの遅延している取引について明示的にemitTransactionStatusChangedを実行する
+     */
+    exportTasks(params: {
+        now: Date;
+        delayInSeconds: number;
+    }): Promise<Pick<import("@chevre/factory/lib/transaction/moneyTransfer").ITransaction | import("@chevre/factory/lib/transaction/placeOrder").ITransaction | import("@chevre/factory/lib/transaction/returnOrder").ITransaction, "typeOf" | "id" | "status">[]>;
     /**
      * set task status exported by transaction id
      * IDでタスクをエクスポート済に変更する

package/lib/chevre/repo/transaction.js

@@ -547,6 +547,46 @@ class MongoRepository {
             //     .exec();
         });
     }
+    /**
+     * タスクエクスポートの遅延している取引について明示的にemitTransactionStatusChangedを実行する
+     */
+    exportTasks(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const delayedTransactions = yield this.transactionModel.find({
+                status: {
+                    $in: [
+                        factory.transactionStatusType.Canceled,
+                        factory.transactionStatusType.Confirmed,
+                        factory.transactionStatusType.Expired
+                    ]
+                },
+                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;
+        });
+    }
     /**
      * set task status exported by transaction id
      * IDでタスクをエクスポート済に変更する

package/lib/chevre/service/offer/event/voidTransaction.d.ts

@@ -5,6 +5,7 @@ import { RedisRepository as OfferRateLimitRepo } from '../../../repo/rateLimit/o
 import { MongoRepository as ReservationRepo } from '../../../repo/reservation';
 import { StockHolderRepository as StockHolderRepo } from '../../../repo/stockHolder';
 import { MongoRepository as TaskRepo } from '../../../repo/task';
+import { MongoRepository as TransactionRepo } from '../../../repo/transaction';
 export import WebAPIIdentifier = factory.service.webAPI.Identifier;
 interface IVoidTransactionRepos {
     action: ActionRepo;
@@ -13,6 +14,7 @@ interface IVoidTransactionRepos {
     offerRateLimit: OfferRateLimitRepo;
     reservation: ReservationRepo;
     task: TaskRepo;
+    transaction: TransactionRepo;
 }
 /**
  * イベントオファー承認取消(タスクから実行)

package/lib/chevre/service/offer/event/voidTransaction.js

@@ -26,8 +26,13 @@ exports.WebAPIIdentifier = factory.service.webAPI.Identifier;
  */
 function voidTransaction(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
+        const transaction = yield repos.transaction.findById({
+            typeOf: params.purpose.typeOf,
+            id: params.purpose.id,
+            inclusion: ['_id', 'typeOf', 'status']
+        });
         // 座席仮予約アクション検索
-        const authorizeActions = yield repos.action.searchByPurpose({
+        let authorizeActions = yield repos.action.searchByPurpose({
             typeOf: factory.actionType.AuthorizeAction,
             purpose: {
                 typeOf: params.purpose.typeOf,
@@ -36,6 +41,17 @@ function voidTransaction(params) {
         })
             .then((actions) => actions
             .filter((a) => a.object.typeOf === factory.action.authorize.offer.seatReservation.ObjectType.SeatReservation));
+        switch (transaction.status) {
+            case factory.transactionStatusType.InProgress:
+                throw new factory.errors.NotImplemented(`${transaction.status} not implemented`);
+            // 確定取引に対応(2023-05-07~)
+            case factory.transactionStatusType.Confirmed:
+                // アクションステータスを検証する
+                authorizeActions = authorizeActions.filter((a) => a.actionStatus !== factory.actionStatusType.CompletedActionStatus);
+                break;
+            default:
+            // no op
+        }
         yield Promise.all(authorizeActions.map((action) => __awaiter(this, void 0, void 0, function* () {
             yield repos.action.cancel({ typeOf: action.typeOf, id: action.id });
             switch (action.instrument.identifier) {

package/lib/chevre/service/task/voidReserveTransaction.js

@@ -17,6 +17,7 @@ const offer_1 = require("../../repo/rateLimit/offer");
 const reservation_1 = require("../../repo/reservation");
 const stockHolder_1 = require("../../repo/stockHolder");
 const task_1 = require("../../repo/task");
+const transaction_1 = require("../../repo/transaction");
 const EventOfferService = require("../offer/event");
 /**
  * タスク実行関数
@@ -38,7 +39,8 @@ function call(data) {
             stockHolder: stockHolderRepo,
             offerRateLimit: offerRateLimitRepo,
             reservation: reservationRepo,
-            task: taskRepo
+            task: taskRepo,
+            transaction: new transaction_1.MongoRepository(settings.connection)
         });
     });
 }

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