@chevre/domain 21.2.0-alpha.26 → 21.2.0-alpha.28

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

@@ -0,0 +1,21 @@
+/// <reference types="node" />
+import { EventEmitter } from 'events';
+import * as factory from '../factory';
+interface IListenArgsOnAssetTransactionStatusChanged {
+    /**
+     * 取引ID
+     */
+    id: string;
+    typeOf: factory.assetTransactionType;
+    status: factory.transactionStatusType;
+}
+type IOnAssetTransactionStatusChangedListener = (listenArgs: IListenArgsOnAssetTransactionStatusChanged) => void;
+/**
+ * 資産取引イベントエミッター
+ */
+declare class AssetTransactionEventEmitter extends EventEmitter {
+    onAssetTransactionStatusChanged(listner: IOnAssetTransactionStatusChangedListener): void;
+    emitAssetTransactionStatusChanged(args: IListenArgsOnAssetTransactionStatusChanged): void;
+}
+declare const assetTransactionEventEmitter: AssetTransactionEventEmitter;
+export { IListenArgsOnAssetTransactionStatusChanged, assetTransactionEventEmitter };

package/lib/chevre/eventEmitter/assetTransaction.js

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.assetTransactionEventEmitter = void 0;
+const events_1 = require("events");
+const settings_1 = require("../settings");
+var EventName;
+(function (EventName) {
+    EventName["OnAssetTransactionStatusChanged"] = "OnAssetTransactionStatusChanged";
+})(EventName || (EventName = {}));
+/**
+ * 資産取引イベントエミッター
+ */
+class AssetTransactionEventEmitter extends events_1.EventEmitter {
+    onAssetTransactionStatusChanged(listner) {
+        this.on(EventName.OnAssetTransactionStatusChanged, listner);
+    }
+    emitAssetTransactionStatusChanged(args) {
+        if (settings_1.USE_EVENT_EMITTERS) {
+            this.emit(EventName.OnAssetTransactionStatusChanged, args);
+        }
+    }
+}
+const assetTransactionEventEmitter = new AssetTransactionEventEmitter();
+exports.assetTransactionEventEmitter = assetTransactionEventEmitter;
+assetTransactionEventEmitter.on('error', (err) => {
+    // tslint:disable-next-line:no-console
+    console.error('assetTransactionEventEmitter listened an error.', err);
+});

package/lib/chevre/eventEmitter.d.ts

@@ -1,3 +1,4 @@
+import { assetTransactionEventEmitter } from './eventEmitter/assetTransaction';
 import { taskEventEmitter } from './eventEmitter/task';
 import { transactionEventEmitter } from './eventEmitter/transaction';
-export { taskEventEmitter as task, transactionEventEmitter as transaction };
+export { assetTransactionEventEmitter as assetTransaction, taskEventEmitter as task, transactionEventEmitter as transaction };

package/lib/chevre/eventEmitter.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.transaction = exports.task = void 0;
+exports.transaction = exports.task = exports.assetTransaction = void 0;
+const assetTransaction_1 = require("./eventEmitter/assetTransaction");
+Object.defineProperty(exports, "assetTransaction", { enumerable: true, get: function () { return assetTransaction_1.assetTransactionEventEmitter; } });
 const task_1 = require("./eventEmitter/task");
 Object.defineProperty(exports, "task", { enumerable: true, get: function () { return task_1.taskEventEmitter; } });
 const transaction_1 = require("./eventEmitter/transaction");

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

@@ -98,6 +98,11 @@ export declare class MongoRepository {
         };
         status: factory.transactionStatusType;
         id?: string;
+        tasksExportAction: {
+            agent: {
+                name: string;
+            };
+        };
     }): Promise<Pick<factory.assetTransaction.ITransaction<T>, 'id' | 'typeOf'> | null>;
     /**
      * タスクエクスポートリトライ

package/lib/chevre/repo/assetTransaction.js

@@ -13,6 +13,7 @@ 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");
 /**
  * 資産取引リポジトリ
  */
@@ -336,6 +337,11 @@ class MongoRepository {
                     throw new factory.errors.NotFound(this.transactionModel.modelName);
                 }
             }
+            assetTransaction_2.assetTransactionEventEmitter.emitAssetTransactionStatusChanged({
+                id: params.id,
+                typeOf: params.typeOf,
+                status: factory.transactionStatusType.Confirmed
+            });
         });
     }
     /**
@@ -360,7 +366,13 @@ class MongoRepository {
                 // 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), { 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), {
+                tasksExportAction: {
+                    agent: { name: params.tasksExportAction.agent.name },
+                    startDate: new Date()
+                },
+                tasksExportationStatus: factory.transactionTasksExportationStatus.Exporting
+            }, { new: true })
                 .select({
                 _id: 1,
                 typeOf: 1
@@ -377,17 +389,51 @@ class MongoRepository {
      */
     reexportTasks(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.transactionModel.updateMany({
+            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();
+                    assetTransaction_2.assetTransactionEventEmitter.emitAssetTransactionStatusChanged({
+                        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();
         });
     }
     /**
@@ -396,12 +442,14 @@ class MongoRepository {
      */
     setTasksExportedById(params) {
         return __awaiter(this, void 0, void 0, function* () {
+            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.endDate': endDate
             })
                 .exec();
         });
@@ -433,6 +481,13 @@ class MongoRepository {
                     endDate: new Date()
                 })
                     .exec();
+                expiringTransactions.forEach((expiringTransaction) => {
+                    assetTransaction_2.assetTransactionEventEmitter.emitAssetTransactionStatusChanged({
+                        id: expiringTransaction.id,
+                        typeOf: expiringTransaction.typeOf,
+                        status: factory.transactionStatusType.Expired
+                    });
+                });
             }
         });
     }
@@ -481,6 +536,11 @@ class MongoRepository {
             else {
                 transaction = doc.toObject();
             }
+            assetTransaction_2.assetTransactionEventEmitter.emitAssetTransactionStatusChanged({
+                id: transaction.id,
+                typeOf: params.typeOf,
+                status: factory.transactionStatusType.Canceled
+            });
             return transaction;
         });
     }

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

@@ -69,6 +69,7 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     tasksExportedAt?: Date | undefined;
     location?: any;
     seller?: any;
+    tasksExportAction?: any;
 }, import("mongoose").Document<unknown, {}, import("mongoose").FlatRecord<{
     object?: any;
     typeOf?: string | undefined;
@@ -87,6 +88,7 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     tasksExportedAt?: Date | undefined;
     location?: any;
     seller?: any;
+    tasksExportAction?: any;
 }>> & Omit<import("mongoose").FlatRecord<{
     object?: any;
     typeOf?: string | undefined;
@@ -105,6 +107,7 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     tasksExportedAt?: Date | undefined;
     location?: any;
     seller?: any;
+    tasksExportAction?: any;
 }> & {
     _id: import("mongoose").Types.ObjectId;
 }, never>>;

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

@@ -22,6 +22,7 @@ const schema = new mongoose_1.Schema({
     expires: Date,
     startDate: Date,
     endDate: Date,
+    tasksExportAction: mongoose_1.SchemaTypes.Mixed,
     tasksExportedAt: Date,
     tasksExportationStatus: String,
     potentialActions: mongoose_1.SchemaTypes.Mixed,

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

@@ -28,6 +28,12 @@ export declare function exportTasks<T extends factory.assetTransactionType>(para
     typeOf?: {
         $in: T[];
     };
+    id?: string;
+    tasksExportAction?: {
+        agent: {
+            name: string;
+        };
+    };
 }): (repos: {
     task: TaskRepo;
     assetTransaction: AssetTransactionRepo;

package/lib/chevre/service/assetTransaction.js

@@ -20,6 +20,7 @@ const PayTransactionService = require("./assetTransaction/pay");
 const RefundTransactionService = require("./assetTransaction/refund");
 const RegisterServiceTransactionService = require("./assetTransaction/registerService");
 const ReserveTransactionService = require("./assetTransaction/reserve");
+const settings_1 = require("../settings");
 exports.cancelReservation = CancelReservationTransactionService;
 exports.moneyTransfer = MoneyTransferTransactionService;
 exports.pay = PayTransactionService;
@@ -31,10 +32,14 @@ exports.reserve = ReserveTransactionService;
  */
 function exportTasks(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const transaction = yield repos.assetTransaction.startExportTasks({
-            typeOf: params.typeOf,
-            status: params.status
-        });
+        var _a;
+        const transaction = yield repos.assetTransaction.startExportTasks(Object.assign({ typeOf: params.typeOf, status: params.status, tasksExportAction: {
+                agent: {
+                    name: (typeof ((_a = params.tasksExportAction) === null || _a === void 0 ? void 0 : _a.agent.name) === 'string')
+                        ? params.tasksExportAction.agent.name
+                        : settings_1.DEFAULT_TASKS_EXPORT_AGENT_NAME
+                }
+            } }, (typeof params.id === 'string') ? { id: params.id } : undefined));
         if (transaction === null) {
             return;
         }

package/lib/chevre/service/transaction.js

@@ -19,7 +19,7 @@ const MoneyTransferTransactionService = require("./transaction/moneyTransfer");
 const PlaceOrderTransactionService = require("./transaction/placeOrder");
 const PlaceOrderInProgressTransactionService = require("./transaction/placeOrderInProgress");
 const ReturnOrderTransactionService = require("./transaction/returnOrder");
-const DEFAULT_TASKS_EXPORT_AGENT_NAME = `${process.env.GAE_APPLICATION}:${process.env.GAE_SERVICE}:jobs`;
+const settings_1 = require("../settings");
 exports.moneyTransfer = MoneyTransferTransactionService;
 exports.placeOrder = PlaceOrderTransactionService;
 exports.placeOrderInProgress = PlaceOrderInProgressTransactionService;
@@ -83,7 +83,7 @@ function exportTasks(params) {
                 agent: {
                     name: (typeof ((_a = params.tasksExportAction) === null || _a === void 0 ? void 0 : _a.agent.name) === 'string')
                         ? params.tasksExportAction.agent.name
-                        : DEFAULT_TASKS_EXPORT_AGENT_NAME
+                        : settings_1.DEFAULT_TASKS_EXPORT_AGENT_NAME
                 }
             } }, (typeof params.id === 'string') ? { id: params.id } : undefined));
         if (transaction === null) {

package/lib/chevre/settings.d.ts

@@ -27,6 +27,7 @@ export type ISettings = factory.project.ISettings & {
     useOfferRateLimitProjects: string[];
 };
 export declare const DEFAULT_PAYMENT_METHOD_TYPE_FOR_CREDIT_CARD: string;
+export declare const DEFAULT_TASKS_EXPORT_AGENT_NAME: string;
 export declare const USE_ASSET_TRANSACTION_SYNC_PROCESSING: boolean;
 export declare const USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING: boolean;
 export declare const USE_NEW_EVENT_AVAILABILITY_KEY_FROM: moment.Moment;

package/lib/chevre/settings.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.settings = exports.USE_EVENT_EMITTERS = exports.USE_NEW_CONFIRMATION_NUMBER_KEY_FROM = exports.USE_NEW_EVENT_AVAILABILITY_KEY_FROM = exports.USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING = exports.USE_ASSET_TRANSACTION_SYNC_PROCESSING = exports.DEFAULT_PAYMENT_METHOD_TYPE_FOR_CREDIT_CARD = exports.DEFAULT_SENDER_EMAIL = exports.TRANSACTION_CANCELED_STORAGE_PERIOD_IN_DAYS = exports.TRANSACTION_CONFIRMED_STORAGE_PERIOD_IN_DAYS = exports.ASSET_TRANSACTION_STORAGE_PERIOD_IN_DAYS = exports.ABORTED_TASKS_WITHOUT_REPORT = void 0;
+exports.settings = exports.USE_EVENT_EMITTERS = exports.USE_NEW_CONFIRMATION_NUMBER_KEY_FROM = exports.USE_NEW_EVENT_AVAILABILITY_KEY_FROM = exports.USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING = exports.USE_ASSET_TRANSACTION_SYNC_PROCESSING = exports.DEFAULT_TASKS_EXPORT_AGENT_NAME = exports.DEFAULT_PAYMENT_METHOD_TYPE_FOR_CREDIT_CARD = exports.DEFAULT_SENDER_EMAIL = exports.TRANSACTION_CANCELED_STORAGE_PERIOD_IN_DAYS = exports.TRANSACTION_CONFIRMED_STORAGE_PERIOD_IN_DAYS = exports.ASSET_TRANSACTION_STORAGE_PERIOD_IN_DAYS = exports.ABORTED_TASKS_WITHOUT_REPORT = void 0;
 const moment = require("moment");
 const factory = require("./factory");
 const transactionWebhookUrls = (typeof process.env.INFORM_TRANSACTION_URL === 'string')
@@ -44,6 +44,7 @@ exports.TRANSACTION_CANCELED_STORAGE_PERIOD_IN_DAYS = (typeof process.env.TRANSA
     : 7;
 exports.DEFAULT_SENDER_EMAIL = process.env.DEFAULT_SENDER_EMAIL;
 exports.DEFAULT_PAYMENT_METHOD_TYPE_FOR_CREDIT_CARD = String(process.env.DEFAULT_PAYMENT_METHOD_TYPE_FOR_CREDIT_CARD);
+exports.DEFAULT_TASKS_EXPORT_AGENT_NAME = `${process.env.GAE_APPLICATION}:${process.env.GAE_SERVICE}:jobs`;
 exports.USE_ASSET_TRANSACTION_SYNC_PROCESSING = process.env.USE_ASSET_TRANSACTION_SYNC_PROCESSING === '1';
 exports.USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING = process.env.USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING === '1';
 exports.USE_NEW_EVENT_AVAILABILITY_KEY_FROM = (typeof process.env.USE_NEW_EVENT_AVAILABILITY_KEY_FROM === 'string')

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