@chevre/domain 21.2.0-alpha.4 → 21.2.0-alpha.41

package/lib/chevre/repo/serviceOutputIdentifier.js

@@ -16,7 +16,6 @@ const util = require("util");
 // tslint:disable-next-line:no-require-imports no-var-requires
 const fpe = require('node-fpe');
 const factory = require("../factory");
-const settings_1 = require("../settings");
 /**
  * サービスアウトプット識別子リポジトリ
  */
@@ -25,15 +24,7 @@ class RedisRepository {
         this.redisClient = redisClient;
     }
     static createKey(params) {
-        const useNewKey = params.startDate instanceof Date
-            && moment(params.startDate)
-                .isSameOrAfter(settings_1.USE_NEW_ORDER_NUMBER_KEY_FROM);
-        if (useNewKey) {
-            return util.format('%s:%s', RedisRepository.REDIS_KEY_PREFIX_NEW, params.timestamp);
-        }
-        else {
-            return util.format('%s:%s', RedisRepository.REDIS_KEY_PREFIX, params.timestamp);
-        }
+        return util.format('%s:%s', RedisRepository.REDIS_KEY_PREFIX, params.timestamp);
     }
     /**
      * タイムスタンプから発行する
@@ -68,6 +59,5 @@ class RedisRepository {
         });
     }
 }
-RedisRepository.REDIS_KEY_PREFIX_NEW = 'serviceOutputIdentifier';
-RedisRepository.REDIS_KEY_PREFIX = 'chevre:serviceOutputIdentifier';
+RedisRepository.REDIS_KEY_PREFIX = 'serviceOutputIdentifier';
 exports.RedisRepository = RedisRepository;

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

@@ -75,4 +75,5 @@ export declare class StockHolderRepository {
         startDate: Date;
         offers: IOffer[];
     }): Promise<IGetHolderResult[]>;
+    private checkIfConflicted;
 }

package/lib/chevre/repo/stockHolder.js

@@ -22,6 +22,12 @@ class StockHolderRepository {
     constructor(redisClient) {
         this.redisClient = redisClient;
     }
+    // public static GET_KEY(params: {
+    //     eventId: string;
+    //     startDate: Date;
+    // }) {
+    //     return StockHolderRepository.createKey(params);
+    // }
     static offer2field(params) {
         var _a, _b;
         // 予約IDをfieldにする場合
@@ -32,9 +38,11 @@ class StockHolderRepository {
         return `${params.seatSection}:${params.seatNumber}`;
     }
     static createKey(params) {
-        const useNewKey = params.startDate instanceof Date
-            && moment(params.startDate)
-                .isSameOrAfter(settings_1.USE_NEW_EVENT_AVAILABILITY_KEY_FROM);
+        if (!(params.startDate instanceof Date)) {
+            throw new factory.errors.Argument('startDate', 'must be Date');
+        }
+        const useNewKey = moment(params.startDate)
+            .isSameOrAfter(settings_1.USE_NEW_EVENT_AVAILABILITY_KEY_FROM);
         if (useNewKey) {
             return `${StockHolderRepository.KEY_PREFIX_NEW}:${params.eventId}`;
         }
@@ -64,7 +72,11 @@ class StockHolderRepository {
      */
     lock(lockKey) {
         return __awaiter(this, void 0, void 0, function* () {
+            if (!(lockKey.expires instanceof Date)) {
+                throw new factory.errors.Argument('expires', 'must be Date');
+            }
             const key = StockHolderRepository.createKey({ eventId: lockKey.eventId, startDate: lockKey.startDate });
+            yield this.checkIfConflicted({ key, eventId: lockKey.eventId });
             const value = lockKey.holder;
             const multi = this.redisClient.multi();
             const fields = lockKey.offers.map((offer) => StockHolderRepository.offer2field(offer));
@@ -74,7 +86,6 @@ class StockHolderRepository {
             const results = yield multi.expireAt(key, moment(lockKey.expires)
                 .unix())
                 .exec();
-            debug('results:', results);
             const lockedFields = [];
             if (Array.isArray(results)) {
                 results.slice(0, fields.length)
@@ -84,17 +95,25 @@ class StockHolderRepository {
                     }
                 });
             }
-            debug('locked fields:', lockedFields);
             const lockedAll = lockedFields.length === fields.length;
             debug('lockedAll?', lockedAll);
-            if (!lockedAll) {
+            // expireAtReplyの検証も追加する(2023-04-19~)
+            const expiredAll = results.slice(fields.length)
+                .every((r) => (r === 1 || r === true));
+            debug('expiredAll?', expiredAll);
+            if (!lockedAll || !expiredAll) {
                 if (lockedFields.length > 0) {
                     // 全て仮押さえできなければ仮押さえできたものは解除
                     yield this.redisClient.multi()
                         .hDel(key, lockedFields)
                         .exec();
                 }
-                throw new factory.errors.AlreadyInUse(factory.reservationType.EventReservation, ['ticketedSeat'], 'Already hold');
+                if (!lockedAll) {
+                    throw new factory.errors.AlreadyInUse(factory.reservationType.EventReservation, ['ticketedSeat'], 'Already hold');
+                }
+                else {
+                    throw new factory.errors.ServiceUnavailable('timeout cannot be set unexpectedly');
+                }
             }
         });
     }
@@ -104,6 +123,7 @@ class StockHolderRepository {
     unlock(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const key = StockHolderRepository.createKey({ eventId: params.eventId, startDate: params.startDate });
+            yield this.checkIfConflicted({ key, eventId: params.eventId });
             const field = StockHolderRepository.offer2field(params.offer);
             yield this.redisClient.multi()
                 .hDel(key, field)
@@ -200,6 +220,53 @@ class StockHolderRepository {
             return result;
         });
     }
+    // public async migrateKey(params: {
+    //     key: string;
+    //     eventId: string;
+    // }): Promise<void> {
+    //     // 旧キーと新キーの両方存在検証(念のため)
+    //     const oldKey = StockHolderRepository.createKey({ eventId: params.eventId, startDate: new Date('2020-01-01T00:00:00Z') });
+    //     const newKey = StockHolderRepository.createKey({ eventId: params.eventId, startDate: new Date('2030-01-01T00:00:00Z') });
+    //     if (params.key !== oldKey) {
+    //         // newの場合oldが存在するはずがない
+    //         const existingOldKeyCount = await this.redisClient.exists(oldKey);
+    //         debug('existingOldKeyCount:', existingOldKeyCount);
+    //         if (existingOldKeyCount > 0) {
+    //             await this.redisClient.del(oldKey);
+    //         }
+    //     }
+    //     if (params.key !== newKey) {
+    //         //  oldの場合newが存在するはずがない
+    //         const existingNewKeyCount = await this.redisClient.exists(newKey);
+    //         debug('existingNewKeyCount:', existingNewKeyCount);
+    //         if (existingNewKeyCount > 0) {
+    //             await this.redisClient.del(newKey);
+    //         }
+    //     }
+    // }
+    checkIfConflicted(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            // 旧キーと新キーの両方存在検証(念のため)
+            const oldKey = StockHolderRepository.createKey({ eventId: params.eventId, startDate: new Date('2020-01-01T00:00:00Z') });
+            const newKey = StockHolderRepository.createKey({ eventId: params.eventId, startDate: new Date('2030-01-01T00:00:00Z') });
+            if (params.key !== oldKey) {
+                // newの場合oldが存在するはずがない
+                const existingOldKeyCount = yield this.redisClient.exists(oldKey);
+                debug('existingOldKeyCount:', existingOldKeyCount);
+                if (existingOldKeyCount > 0) {
+                    throw new factory.errors.ServiceUnavailable('stockHolder keys conflicted');
+                }
+            }
+            if (params.key !== newKey) {
+                //  oldの場合newが存在するはずがない
+                const existingNewKeyCount = yield this.redisClient.exists(newKey);
+                debug('existingNewKeyCount:', existingNewKeyCount);
+                if (existingNewKeyCount > 0) {
+                    throw new factory.errors.ServiceUnavailable('stockHolder keys conflicted');
+                }
+            }
+        });
+    }
 }
 StockHolderRepository.KEY_PREFIX_NEW = 'stockHolder';
 StockHolderRepository.KEY_PREFIX = 'chevre:itemAvailability:screeningEvent';

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

@@ -17,6 +17,9 @@ interface IStatus {
 export interface IAggregateTask {
     statuses: IStatus[];
 }
+interface IOptionOnCreate {
+    emitImmediately: boolean;
+}
 /**
  * タスクリポジトリ
  */
@@ -24,13 +27,43 @@ export declare class MongoRepository {
     readonly taskModel: typeof Model;
     constructor(connection: Connection);
     static CREATE_MONGO_CONDITIONS(params: factory.task.ISearchConditions): any[];
-    saveMany(taskAttributes: factory.task.IAttributes<factory.taskName>[]): Promise<{
+    saveMany(taskAttributes: factory.task.IAttributes<factory.taskName>[], options: IOptionOnCreate): Promise<{
         id: string;
     }[]>;
-    createInformTaskIfNotExist(params: factory.task.IAttributes<factory.taskName.TriggerWebhook>): Promise<void>;
+    createInformTaskIfNotExist(params: factory.task.IAttributes<factory.taskName.TriggerWebhook>, options: IOptionOnCreate): Promise<void>;
+    executeById(params: {
+        id: string;
+        executor: {
+            name: string;
+        };
+    }): Promise<factory.task.ITask<factory.taskName> | null>;
     executeOneByName<T extends factory.taskName>(params: {
         name: T;
+        executor: {
+            name: string;
+        };
     }): Promise<factory.task.ITask<T> | null>;
+    /**
+     * 一定期間遅延したタスクを実行する
+     */
+    executeTasks(params: {
+        now: Date;
+        /**
+         * 指定期間遅延しているタスクを実行する
+         */
+        delayInSeconds: number;
+        limit: number;
+        name: {
+            /**
+             * 指定タスクのみ実行する
+             */
+            $in?: factory.taskName[];
+            /**
+             * 指定タスク以外のみ実行する
+             */
+            $nin?: factory.taskName[];
+        };
+    }): Promise<Pick<import("@chevre/factory/lib/task").ITask | import("@chevre/factory/lib/task/deleteAssetTransaction").ITask | import("@chevre/factory/lib/task/deleteOrder").ITask | import("@chevre/factory/lib/task/deleteTransaction").ITask | import("@chevre/factory/lib/task/sendEmailMessage").ITask | import("@chevre/factory/lib/task/triggerWebhook").ITask | import("@chevre/factory/lib/task/confirmMoneyTransfer").ITask | import("@chevre/factory/lib/task/confirmRegisterService").ITask | import("@chevre/factory/lib/task/confirmPayTransaction").ITask | import("@chevre/factory/lib/task/confirmRegisterServiceTransaction").ITask | import("@chevre/factory/lib/task/confirmReserveTransaction").ITask | import("@chevre/factory/lib/task/deleteMember").ITask | import("@chevre/factory/lib/task/givePointAward").ITask | import("@chevre/factory/lib/task/orderProgramMembership").ITask | import("@chevre/factory/lib/task/placeOrder").ITask | import("@chevre/factory/lib/task/returnOrder").ITask | import("@chevre/factory/lib/task/returnMoneyTransfer").ITask | import("@chevre/factory/lib/task/returnPayTransaction").ITask | import("@chevre/factory/lib/task/returnPointAward").ITask | import("@chevre/factory/lib/task/returnReserveTransaction").ITask | import("@chevre/factory/lib/task/sendOrder").ITask | import("@chevre/factory/lib/task/voidMoneyTransferTransaction").ITask | import("@chevre/factory/lib/task/voidPayTransaction").ITask | import("@chevre/factory/lib/task/voidRegisterServiceTransaction").ITask | import("@chevre/factory/lib/task/voidReserveTransaction").ITask, "id" | "name" | "status">[]>;
     retry(params: {
         intervalInMinutes: number;
     }): Promise<void>;
@@ -61,6 +94,9 @@ export declare class MongoRepository {
     deleteByName(params: {
         name: factory.taskName;
     }): Promise<import("mongodb").DeleteResult>;
+    countDelayedTasks(params: {
+        delayInSeconds: number;
+    }): Promise<number>;
     aggregateTask(params: {
         project?: {
             id?: {

package/lib/chevre/repo/task.js

@@ -12,8 +12,8 @@ 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 task_1 = require("./mongoose/schemas/task");
+const task_2 = require("../eventEmitter/task");
 /**
  * タスク実行時のソート条件
  */
@@ -27,9 +27,6 @@ const sortOrder4executionOfTasks = {
 class MongoRepository {
     constructor(connection) {
         this.taskModel = connection.model(task_1.modelName, task_1.schema);
-        if (connection.get('autoIndex') === true) {
-            this.taskModel.on(onIndexCreated_1.INDEX_EVENT, onIndexCreated_1.onIndexCreated);
-        }
     }
     // tslint:disable-next-line:max-func-body-length
     static CREATE_MONGO_CONDITIONS(params) {
@@ -153,27 +150,37 @@ class MongoRepository {
         }
         return andConditions;
     }
-    saveMany(taskAttributes) {
+    saveMany(taskAttributes, options) {
         return __awaiter(this, void 0, void 0, function* () {
+            const emitImmediately = (options === null || options === void 0 ? void 0 : options.emitImmediately) === true;
             if (taskAttributes.length > 0) {
                 const result = yield this.taskModel.insertMany(taskAttributes, { ordered: false, rawResult: true });
                 if (result.insertedCount !== taskAttributes.length) {
                     throw new factory.errors.ServiceUnavailable('all tasks not saved');
                 }
-                // return result.ops;
-                return Object.values(result.insertedIds)
+                const savedTasks = Object.values(result.insertedIds)
                     .map((objectId) => {
                     return { id: objectId.toHexString() };
                 });
+                if (emitImmediately) {
+                    taskAttributes.forEach((savedTask) => {
+                        task_2.taskEventEmitter.emitTaskStatusChanged({
+                            name: savedTask.name,
+                            status: factory.taskStatus.Ready
+                        });
+                    });
+                }
+                // return result.ops;
+                return savedTasks;
             }
             else {
                 return [];
             }
         });
     }
-    createInformTaskIfNotExist(params) {
+    createInformTaskIfNotExist(params, options) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.taskModel.findOneAndUpdate({
+            const createdTask = yield this.taskModel.findOneAndUpdate({
                 'project.id': { $eq: params.project.id },
                 name: params.name,
                 'data.object.id': {
@@ -181,7 +188,38 @@ class MongoRepository {
                     $eq: String(params.data.object.id)
                 }
             }, { $setOnInsert: params }, { new: true, upsert: true })
+                .select({ _id: 1 })
                 .exec();
+            if (options.emitImmediately) {
+                task_2.taskEventEmitter.emitTaskStatusChanged({
+                    id: createdTask.id,
+                    name: params.name,
+                    status: factory.taskStatus.Ready
+                });
+            }
+        });
+    }
+    executeById(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const doc = yield this.taskModel.findOneAndUpdate({
+                status: factory.taskStatus.Ready,
+                runsAt: { $lt: new Date() },
+                _id: { $eq: params.id }
+            }, {
+                status: factory.taskStatus.Running,
+                lastTriedAt: new Date(),
+                $inc: {
+                    remainingNumberOfTries: -1,
+                    numberOfTried: 1 // トライ回数増やす
+                },
+                executor: params.executor
+            }, { new: true })
+                .exec();
+            if (doc === null) {
+                // tslint:disable-next-line:no-null-keyword
+                return null;
+            }
+            return doc.toObject();
         });
     }
     executeOneByName(params) {
@@ -196,7 +234,8 @@ class MongoRepository {
                 $inc: {
                     remainingNumberOfTries: -1,
                     numberOfTried: 1 // トライ回数増やす
-                }
+                },
+                executor: params.executor
             }, { new: true })
                 .sort(sortOrder4executionOfTasks)
                 .exec();
@@ -207,6 +246,35 @@ class MongoRepository {
             return doc.toObject();
         });
     }
+    /**
+     * 一定期間遅延したタスクを実行する
+     */
+    executeTasks(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const runsAtLt = moment(params.now)
+                .add(-params.delayInSeconds, 'seconds')
+                .toDate();
+            const delayedTasks = yield this.taskModel.find(Object.assign(Object.assign({ status: { $eq: factory.taskStatus.Ready }, runsAt: { $lt: runsAtLt } }, (Array.isArray(params.name.$in)) ? { name: { $in: params.name.$in } } : undefined), (Array.isArray(params.name.$nin)) ? { name: { $nin: params.name.$nin } } : undefined))
+                .select({
+                _id: 1,
+                name: 1,
+                status: 1
+            })
+                .limit(params.limit)
+                .setOptions({ maxTimeMS: 10000 })
+                .exec();
+            if (delayedTasks.length > 0) {
+                delayedTasks.forEach((delayedTask) => {
+                    task_2.taskEventEmitter.emitTaskStatusChanged({
+                        id: delayedTask.id,
+                        name: delayedTask.name,
+                        status: delayedTask.status
+                    });
+                });
+            }
+            return delayedTasks;
+        });
+    }
     retry(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const lastTriedAtShoudBeLessThan = moment()
@@ -344,6 +412,18 @@ class MongoRepository {
                 .exec();
         });
     }
+    countDelayedTasks(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const runsAtLt = moment()
+                .add(-params.delayInSeconds, 'seconds')
+                .toDate();
+            return this.taskModel.count({
+                status: factory.taskStatus.Ready,
+                runsAt: { $lt: runsAtLt }
+            })
+                .exec();
+        });
+    }
     aggregateTask(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const statuses = yield Promise.all([

package/lib/chevre/repo/telemetry.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MongoRepository = void 0;
-const onIndexCreated_1 = require("./mongoose/onIndexCreated");
 const telemetry_1 = require("./mongoose/schemas/telemetry");
 /**
  * 測定リポジトリ
@@ -9,9 +8,6 @@ const telemetry_1 = require("./mongoose/schemas/telemetry");
 class MongoRepository {
     constructor(connection) {
         this.telemetryModel = connection.model(telemetry_1.modelName, telemetry_1.schema);
-        if (connection.get('autoIndex') === true) {
-            this.telemetryModel.on(onIndexCreated_1.INDEX_EVENT, onIndexCreated_1.onIndexCreated);
-        }
     }
 }
 exports.MongoRepository = MongoRepository;

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

@@ -40,6 +40,8 @@ export declare class MongoRepository {
     findById<T extends factory.transactionType>(params: {
         typeOf: T;
         id: string;
+        inclusion?: string[];
+        exclusion?: string[];
     }): Promise<factory.transaction.ITransaction<T>>;
     /**
      * 進行中の取引を取得する
@@ -111,7 +113,13 @@ export declare class MongoRepository {
             $in: T[];
         };
         status: factory.transactionStatusType;
-    }): Promise<factory.transaction.ITransaction<T> | null>;
+        id?: string;
+        tasksExportAction: {
+            agent: {
+                name: string;
+            };
+        };
+    }): Promise<Pick<factory.transaction.ITransaction<T>, 'id' | 'typeOf'> | null>;
     /**
      * タスクエクスポートリトライ
      * TODO updatedAtを基準にしているが、タスクエクスポートトライ日時を持たせた方が安全か？
@@ -119,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, "id" | "typeOf" | "status">[]>;
     /**
      * set task status exported by transaction id
      * IDでタスクをエクスポート済に変更する
@@ -150,7 +165,7 @@ export declare class MongoRepository {
     /**
      * 特定の取引を更新する(汎用)
      */
-    findByIdAndUpdate(params: {
+    findByIdAndUpdateInProgress(params: {
         id: string;
         update: {
             $set?: any;