@chevre/domain 21.2.0-alpha.8 → 21.2.0-alpha.80

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

@@ -0,0 +1,20 @@
+// 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.startExportTasks({
+        typeOf: { $in: [chevre.factory.transactionType.PlaceOrder] },
+        status: chevre.factory.transactionStatusType.Confirmed,
+        tasksExportAction: { agent: { name: 'xxx' } }
+    });
+    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/example/src/playOnMoment.ts

@@ -0,0 +1,24 @@
+// tslint:disable:no-console
+import * as moment from 'moment-timezone';
+
+const startDate = moment('2023-05-27T00:00:00Z')
+    .toDate();
+const gracePeriodBeforeStartInDaysMin = {
+    timezone: 'Asia/Tokyo',
+    time: '09:38:00',
+    period: { value: 3 }
+};
+const returningDate = new Date();
+
+const minDate: string = moment(startDate)
+    .tz(gracePeriodBeforeStartInDaysMin.timezone)
+    .startOf('days')
+    .subtract(gracePeriodBeforeStartInDaysMin.period.value, 'days')
+    .format('YYYY-MM-DD');
+console.log('minDate:', minDate);
+
+const returnMaxDate = moment(`${minDate}T${gracePeriodBeforeStartInDaysMin.time}`)
+    .tz(gracePeriodBeforeStartInDaysMin.timezone);
+console.log(returnMaxDate);
+
+console.log(returnMaxDate.isSameOrAfter(moment(returningDate)));

package/lib/chevre/credentials.d.ts

@@ -27,6 +27,7 @@ export declare const credentials: {
     lineNotify: {
         url: string;
         accessToken: string;
+        accessTokenAlert: string;
     };
     movieticketReserve: {
         timeout: number;

package/lib/chevre/credentials.js

@@ -31,7 +31,8 @@ exports.credentials = {
     },
     lineNotify: {
         url: process.env.LINE_NOTIFY_URL,
-        accessToken: process.env.LINE_NOTIFY_ACCESS_TOKEN
+        accessToken: process.env.LINE_NOTIFY_ACCESS_TOKEN,
+        accessTokenAlert: process.env.LINE_NOTIFY_ACCESS_TOKEN_ALERT
     },
     movieticketReserve: {
         // tslint:disable-next-line:no-magic-numbers

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,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.assetTransactionEventEmitter = void 0;
+const events_1 = require("events");
+var EventName;
+(function (EventName) {
+    EventName["OnAssetTransactionStatusChanged"] = "OnAssetTransactionStatusChanged";
+})(EventName || (EventName = {}));
+/**
+ * 資産取引イベントエミッター
+ */
+class AssetTransactionEventEmitter extends events_1.EventEmitter {
+    onAssetTransactionStatusChanged(listner) {
+        this.on(EventName.OnAssetTransactionStatusChanged, listner);
+    }
+    emitAssetTransactionStatusChanged(args) {
+        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/task.d.ts

@@ -0,0 +1,18 @@
+/// <reference types="node" />
+import { EventEmitter } from 'events';
+import * as factory from '../factory';
+interface IListenArgsOnTaskStatusChanged {
+    id: string;
+    name?: factory.taskName;
+    status: factory.taskStatus;
+}
+type IOnTaskStatusChangedListener = (listenArgs: IListenArgsOnTaskStatusChanged) => void;
+/**
+ * タスクイベントエミッター
+ */
+declare class TaskEventEmitter extends EventEmitter {
+    onTaskStatusChanged(listner: IOnTaskStatusChangedListener): void;
+    emitTaskStatusChanged(args: IListenArgsOnTaskStatusChanged): void;
+}
+declare const taskEventEmitter: TaskEventEmitter;
+export { IOnTaskStatusChangedListener, taskEventEmitter };

package/lib/chevre/eventEmitter/task.js

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.taskEventEmitter = void 0;
+const events_1 = require("events");
+var EventName;
+(function (EventName) {
+    EventName["OnTaskStatusChanged"] = "OnTaskStatusChanged";
+})(EventName || (EventName = {}));
+/**
+ * タスクイベントエミッター
+ */
+class TaskEventEmitter extends events_1.EventEmitter {
+    onTaskStatusChanged(listner) {
+        this.on(EventName.OnTaskStatusChanged, listner);
+    }
+    emitTaskStatusChanged(args) {
+        this.emit(EventName.OnTaskStatusChanged, args);
+    }
+}
+const taskEventEmitter = new TaskEventEmitter();
+exports.taskEventEmitter = taskEventEmitter;
+taskEventEmitter.on('error', (err) => {
+    // tslint:disable-next-line:no-console
+    console.error('taskEventEmitter listened an error.', err);
+});

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

@@ -0,0 +1,21 @@
+/// <reference types="node" />
+import { EventEmitter } from 'events';
+import * as factory from '../factory';
+interface IListenArgsOnTransactionStatusChanged {
+    /**
+     * 取引ID
+     */
+    id: string;
+    typeOf: factory.transactionType;
+    status: factory.transactionStatusType;
+}
+type IOnTransactionStatusChangedListener = (listenArgs: IListenArgsOnTransactionStatusChanged) => void;
+/**
+ * 取引イベントエミッター
+ */
+declare class TransactionEventEmitter extends EventEmitter {
+    onTransactionStatusChanged(listner: IOnTransactionStatusChangedListener): void;
+    emitTransactionStatusChanged(args: IListenArgsOnTransactionStatusChanged): void;
+}
+declare const transactionEventEmitter: TransactionEventEmitter;
+export { IListenArgsOnTransactionStatusChanged, transactionEventEmitter };

package/lib/chevre/eventEmitter/transaction.js

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.transactionEventEmitter = void 0;
+const events_1 = require("events");
+var EventName;
+(function (EventName) {
+    EventName["OnTransactionStatusChanged"] = "OnTransactionStatusChanged";
+})(EventName || (EventName = {}));
+/**
+ * 取引イベントエミッター
+ */
+class TransactionEventEmitter extends events_1.EventEmitter {
+    onTransactionStatusChanged(listner) {
+        this.on(EventName.OnTransactionStatusChanged, listner);
+    }
+    emitTransactionStatusChanged(args) {
+        this.emit(EventName.OnTransactionStatusChanged, args);
+    }
+}
+const transactionEventEmitter = new TransactionEventEmitter();
+exports.transactionEventEmitter = transactionEventEmitter;
+transactionEventEmitter.on('error', (err) => {
+    // tslint:disable-next-line:no-console
+    console.error('transactionEventEmitter listened an error.', err);
+});

package/lib/chevre/eventEmitter.d.ts

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

package/lib/chevre/eventEmitter.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+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");
+Object.defineProperty(exports, "transaction", { enumerable: true, get: function () { return transaction_1.transactionEventEmitter; } });

package/lib/chevre/index.d.ts

@@ -6,9 +6,10 @@ import * as GMO from '@motionpicture/gmo-service';
 import * as surfrock from '@surfrock/sdk';
 import { credentials } from './credentials';
 import * as errorHandler from './errorHandler';
+import * as eventEmitter from './eventEmitter';
 import * as factory from './factory';
 import * as pecorinoapi from './pecorinoapi';
 import * as repository from './repository';
 import * as service from './service';
-import { settings } from './settings';
-export { credentials, errorHandler, factory, repository, service, settings, surfrock, pecorinoapi, COA, GMO };
+import * as settings from './settings';
+export { credentials, errorHandler, eventEmitter, factory, repository, service, settings, surfrock, pecorinoapi, COA, GMO };

package/lib/chevre/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.GMO = exports.COA = exports.pecorinoapi = exports.surfrock = exports.settings = exports.service = exports.repository = exports.factory = exports.errorHandler = exports.credentials = void 0;
+exports.GMO = exports.COA = exports.pecorinoapi = exports.surfrock = exports.settings = exports.service = exports.repository = exports.factory = exports.eventEmitter = exports.errorHandler = exports.credentials = void 0;
 /**
  * index module
  */
@@ -14,6 +14,8 @@ const credentials_1 = require("./credentials");
 Object.defineProperty(exports, "credentials", { enumerable: true, get: function () { return credentials_1.credentials; } });
 const errorHandler = require("./errorHandler");
 exports.errorHandler = errorHandler;
+const eventEmitter = require("./eventEmitter");
+exports.eventEmitter = eventEmitter;
 const factory = require("./factory");
 exports.factory = factory;
 const pecorinoapi = require("./pecorinoapi");
@@ -22,5 +24,5 @@ const repository = require("./repository");
 exports.repository = repository;
 const service = require("./service");
 exports.service = service;
-const settings_1 = require("./settings");
-Object.defineProperty(exports, "settings", { enumerable: true, get: function () { return settings_1.settings; } });
+const settings = require("./settings");
+exports.settings = settings;

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

@@ -42,21 +42,13 @@ export declare class MongoRepository {
         id?: string;
         transactionNumber?: string;
     }): Promise<factory.account.transaction.ITransaction<T>>;
-    /**
-     * タスク未エクスポートの取引をひとつ取得してエクスポートを開始する
-     */
-    /**
-     * タスクエクスポートリトライ
-     * TODO updatedAtを基準にしているが、タスクエクスポートトライ日時を持たせた方が安全か？
-     */
-    /**
-     * タスクをエクスポート済に変更する
-     */
     /**
      * 取引を期限切れにする
      */
     makeExpired(params: {
-        expires: Date;
+        expires: {
+            $lt: Date;
+        };
     }): Promise<void>;
     /**
      * 取引を検索する

package/lib/chevre/repo/accountTransaction.js

@@ -221,59 +221,6 @@ class MongoRepository {
             return doc.toObject();
         });
     }
-    /**
-     * タスク未エクスポートの取引をひとつ取得してエクスポートを開始する
-     */
-    // public async startExportTasks<T extends factory.account.transactionType>(
-    //     status: factory.transactionStatusType
-    // ): Promise<factory.account.transaction.ITransaction<T> | null> {
-    //     return this.transactionModel.findOneAndUpdate(
-    //         {
-    //             status: status,
-    //             tasksExportationStatus: factory.transactionTasksExportationStatus.Unexported
-    //         },
-    //         { tasksExportationStatus: factory.transactionTasksExportationStatus.Exporting },
-    //         { new: true }
-    //     )
-    //         .exec()
-    //         // tslint:disable-next-line:no-null-keyword
-    //         .then((doc) => (doc === null) ? null : doc.toObject());
-    // }
-    // tslint:disable-next-line:no-suspicious-comment
-    /**
-     * タスクエクスポートリトライ
-     * TODO updatedAtを基準にしているが、タスクエクスポートトライ日時を持たせた方が安全か？
-     */
-    // public async reexportTasks(params: { intervalInMinutes: number }): Promise<void> {
-    //     await this.transactionModel.updateMany(
-    //         {
-    //             tasksExportationStatus: factory.transactionTasksExportationStatus.Exporting,
-    //             updatedAt: {
-    //                 $lt: moment()
-    //                     .add(-params.intervalInMinutes, 'minutes')
-    //                     .toDate()
-    //             }
-    //         },
-    //         {
-    //             tasksExportationStatus: factory.transactionTasksExportationStatus.Unexported
-    //         }
-    //     )
-    //         .exec();
-    // }
-    /**
-     * タスクをエクスポート済に変更する
-     */
-    // public async setTasksExportedById(transactionId: string): Promise<void> {
-    //     await this.transactionModel.findByIdAndUpdate(
-    //         transactionId,
-    //         {
-    //             tasksExportationStatus: factory.transactionTasksExportationStatus.Exported,
-    //             tasksExportedAt: moment()
-    //                 .toDate()
-    //         }
-    //     )
-    //         .exec();
-    // }
     /**
      * 取引を期限切れにする
      */
@@ -282,7 +229,7 @@ class MongoRepository {
             // ステータスと期限を見て更新
             yield this.transactionModel.updateMany({
                 status: factory.transactionStatusType.InProgress,
-                expires: { $lt: params.expires }
+                expires: { $lt: params.expires.$lt }
             }, {
                 status: factory.transactionStatusType.Expired,
                 endDate: new Date()

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

@@ -82,7 +82,18 @@ export declare class MongoRepository {
         typeOf?: T;
         purpose: {
             typeOf: factory.transactionType;
-            id?: string;
+            id: string;
+        };
+        object?: {
+            typeOf?: {
+                $eq?: factory.action.authorize.offer.seatReservation.ObjectType.SeatReservation | factory.action.authorize.paymentMethod.any.ResultType.Payment;
+            };
+            paymentMethodId?: {
+                $eq?: string;
+            };
+        };
+        actionStatus?: {
+            $eq?: factory.actionStatusType;
         };
         sort?: factory.action.ISortOrder;
     }): Promise<IAction<T>[]>;
@@ -122,6 +133,23 @@ export declare class MongoRepository {
     deleteEndDatePassedCertainPeriod(params: {
         $lt: Date;
     }): Promise<void>;
+    /**
+     * 取引からアクションを削除する
+     */
+    deleteByPurpose(params: {
+        project: {
+            id: string;
+        };
+        purpose: {
+            typeOf: factory.transactionType;
+            id: string;
+        };
+        typeOf: {
+            $in: factory.actionType[];
+        };
+    }): Promise<{
+        deletedCount?: number;
+    } | null>;
     aggregateAuthorizeEventServiceOfferAction(params: {
         project?: {
             id?: {

package/lib/chevre/repo/action.js

@@ -528,32 +528,16 @@ class MongoRepository {
      * 取引に対するアクション検索時などに使用
      */
     searchByPurpose(params) {
-        var _a;
+        var _a, _b, _c, _d, _e, _f;
         return __awaiter(this, void 0, void 0, function* () {
-            const conditions = {
-                'purpose.typeOf': {
-                    $exists: true,
-                    $eq: params.purpose.typeOf
-                }
-            };
-            if (params.typeOf !== undefined) {
-                conditions.typeOf = params.typeOf;
-            }
-            if (params.purpose.id !== undefined) {
-                conditions['purpose.id'] = {
-                    $exists: true,
-                    $eq: params.purpose.id
-                };
-            }
-            const query = this.actionModel.find(conditions)
-                .select({ __v: 0, createdAt: 0, updatedAt: 0 });
-            // tslint:disable-next-line:no-single-line-block-comment
-            /* istanbul ignore else */
-            if (((_a = params.sort) === null || _a === void 0 ? void 0 : _a.startDate) !== undefined) {
-                query.sort({ startDate: params.sort.startDate });
-            }
-            return query.exec()
-                .then((docs) => docs.map((doc) => doc.toObject()));
+            return this.search(Object.assign(Object.assign(Object.assign({ purpose: {
+                    id: { $in: [params.purpose.id] },
+                    typeOf: { $in: [params.purpose.typeOf] }
+                }, object: Object.assign(Object.assign({}, (typeof ((_b = (_a = params.object) === null || _a === void 0 ? void 0 : _a.typeOf) === null || _b === void 0 ? void 0 : _b.$eq) === 'string')
+                    ? { typeOf: { $eq: params.object.typeOf.$eq } }
+                    : undefined), (typeof ((_d = (_c = params.object) === null || _c === void 0 ? void 0 : _c.paymentMethodId) === null || _d === void 0 ? void 0 : _d.$eq) === 'string')
+                    ? { paymentMethodId: { $eq: params.object.paymentMethodId.$eq } }
+                    : undefined) }, (typeof ((_e = params.actionStatus) === null || _e === void 0 ? void 0 : _e.$eq) === 'string') ? { actionStatus: { $in: [params.actionStatus.$eq] } } : undefined), (typeof params.typeOf === 'string') ? { typeOf: { $eq: params.typeOf } } : undefined), (typeof ((_f = params.sort) === null || _f === void 0 ? void 0 : _f.startDate) === 'number') ? { sort: params.sort } : undefined), [], []);
         });
     }
     /**
@@ -691,6 +675,29 @@ class MongoRepository {
                 .exec();
         });
     }
+    /**
+     * 取引からアクションを削除する
+     */
+    deleteByPurpose(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.actionModel.deleteMany({
+                'project.id': { $eq: params.project.id },
+                typeOf: { $in: params.typeOf.$in },
+                'purpose.id': { $exists: true, $eq: params.purpose.id },
+                'purpose.typeOf': { $exists: true, $eq: params.purpose.typeOf }
+            })
+                .exec()
+                .then((result) => {
+                return {
+                    // n: result?.n,
+                    // opTime: result.opTime,
+                    // ok: result?.ok,
+                    // operationTime,
+                    deletedCount: result === null || result === void 0 ? void 0 : result.deletedCount
+                };
+            });
+        });
+    }
     aggregateAuthorizeEventServiceOfferAction(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const statuses = yield Promise.all([

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

@@ -64,13 +64,10 @@ export declare class MongoRepository {
         typeOf: T;
         transactionNumber: string;
     }): Promise<factory.assetTransaction.ITransaction<T>>;
-    /**
-     * 取引を確定する
-     */
     addReservations(params: {
         typeOf: factory.assetTransactionType.Reserve;
         id: string;
-        object: factory.assetTransaction.reserve.IObject;
+        object: Pick<factory.assetTransaction.reserve.IObject, 'acceptedOffer' | 'reservationFor' | 'subReservation'>;
     }): Promise<factory.assetTransaction.ITransaction<factory.assetTransactionType.Reserve>>;
     /**
      * 取引を確定する
@@ -78,9 +75,10 @@ export declare class MongoRepository {
     confirm<T extends factory.assetTransactionType>(params: {
         typeOf: T;
         id: string;
+        object?: Pick<factory.action.reserve.IReservationPackageAsObject, 'underName'>;
         result: factory.assetTransaction.IResult<T>;
         potentialActions: factory.assetTransaction.IPotentialActions<T>;
-    }): Promise<factory.assetTransaction.ITransaction<T>>;
+    }): Promise<void>;
     /**
      * 取引を開始&確定
      */
@@ -100,7 +98,13 @@ export declare class MongoRepository {
             $in: T[];
         };
         status: factory.transactionStatusType;
-    }): Promise<factory.assetTransaction.ITransaction<T> | null>;
+        id?: string;
+        tasksExportAction: {
+            agent: {
+                name: string;
+            };
+        };
+    }): Promise<Pick<factory.assetTransaction.ITransaction<T>, 'id' | 'typeOf'> | null>;
     /**
      * タスクエクスポートリトライ
      * TODO updatedAtを基準にしているが、タスクエクスポートトライ日時を持たせた方が安全か？
@@ -108,6 +112,16 @@ export declare class MongoRepository {
     reexportTasks(params: {
         intervalInMinutes: number;
     }): Promise<void>;
+    /**
+     * タスクエクスポートの遅延している取引について明示的にemitTransactionStatusChangedを実行する
+     */
+    exportTasks(params: {
+        now: Date;
+        delayInSeconds: number;
+        status: {
+            $in: factory.transactionStatusType[];
+        };
+    }): 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, "id" | "typeOf" | "status">[]>;
     /**
      * set task status exported by transaction id
      * IDでタスクをエクスポート済に変更する
@@ -119,7 +133,9 @@ export declare class MongoRepository {
      * 取引を期限切れにする
      */
     makeExpired(params: {
-        expires: Date;
+        expires: {
+            $lt: Date;
+        };
     }): Promise<void>;
     /**
      * 取引を中止する
@@ -133,7 +149,7 @@ export declare class MongoRepository {
     /**
      * 取引を検索する
      */
-    search<T extends factory.assetTransactionType>(params: factory.assetTransaction.ISearchConditions<T>, projection?: any): Promise<factory.assetTransaction.ITransaction<T>[]>;
+    search<T extends factory.assetTransactionType>(params: factory.assetTransaction.ISearchConditions<T>, inclusion?: string[], exclusion?: string[]): Promise<factory.assetTransaction.ITransaction<T>[]>;
     /**
      * 取引番号指定で削除する
      */
@@ -159,7 +175,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>>;