@chevre/domain 22.11.0-alpha.2 → 22.11.0-alpha.20

package/lib/chevre/repo/task.js

@@ -242,48 +242,6 @@ class TaskRepo {
             return { id, status };
         });
     }
-    // public async createIfNotExistByIdentifier(
-    //     params: factory.task.IAttributes<factory.taskName> & {
-    //         // resolve uniqueness of identifier(2025-03-27~)
-    //         identifier: string;
-    //     },
-    //     options: IOptionOnCreate
-    // ): Promise<void> {
-    //     if (typeof params.identifier !== 'string' || params.identifier.length === 0) {
-    //         throw new factory.errors.ArgumentNull('identifier');
-    //     }
-    //     try {
-    //         const createdTask = await this.taskModel.findOneAndUpdate(
-    //             {
-    //                 'project.id': { $eq: params.project.id },
-    //                 name: { $eq: params.name },
-    //                 identifier: { $exists: true, $eq: params.identifier }
-    //             },
-    //             { $setOnInsert: params },
-    //             { new: true, upsert: true }
-    //         )
-    //             .select({ _id: 1 })
-    //             .exec();
-    //         if (options.emitImmediately) {
-    //             taskEventEmitter.emitTaskStatusChanged({
-    //                 id: createdTask.id,
-    //                 name: params.name,
-    //                 status: factory.taskStatus.Ready
-    //             });
-    //         }
-    //     } catch (error) {
-    //         let throwsError = true;
-    //         if (await isMongoError(error)) {
-    //             // すでにidentifierが存在する場合ok
-    //             if (error.code === MongoErrorCode.DuplicateKey) {
-    //                 throwsError = false;
-    //             }
-    //         }
-    //         if (throwsError) {
-    //             throw error;
-    //         }
-    //     }
-    // }
     /**
      * タスク識別子から冪等作成する
      * reimplement createIfNotExistByIdentifier(2025-03-28~)
@@ -341,40 +299,6 @@ class TaskRepo {
             }
         });
     }
-    // public async createInformTaskIfNotExist(
-    //     // resolve uniqueness of identifier(2025-03-27~)
-    //     params: Pick<
-    //         factory.task.IAttributes<factory.taskName.TriggerWebhook>,
-    //         'data' | 'executionResults' | 'name' | 'numberOfTried' | 'project' | 'remainingNumberOfTries' | 'runsAt' | 'status'
-    //     > & {
-    //         data: factory.task.triggerWebhook.IInformAnyResourceAction & {
-    //             object: factory.notification.person.IPersonAsNotification;
-    //         };
-    //     },
-    //     options: IOptionOnCreate
-    // ): Promise<void> {
-    //     const createdTask = await this.taskModel.findOneAndUpdate(
-    //         {
-    //             'project.id': { $eq: params.project.id },
-    //             name: params.name,
-    //             'data.object.id': {
-    //                 $exists: true,
-    //                 $eq: String(params.data.object.id)
-    //             }
-    //         },
-    //         { $setOnInsert: params },
-    //         { new: true, upsert: true }
-    //     )
-    //         .select({ _id: 1 })
-    //         .exec();
-    //     if (options.emitImmediately) {
-    //         taskEventEmitter.emitTaskStatusChanged({
-    //             id: createdTask.id,
-    //             name: params.name,
-    //             status: factory.taskStatus.Ready
-    //         });
-    //     }
-    // }
     /**
      * 取引削除タスク冪等作成
      */
@@ -401,36 +325,6 @@ class TaskRepo {
             }
         });
     }
-    // public async createConfirmReserveTransactionTaskIfNotExist(
-    //     params: factory.task.IAttributes<factory.taskName.ConfirmReserveTransaction>,
-    //     options: IOptionOnCreate
-    // ): Promise<void> {
-    //     const createdTask = await this.taskModel.findOneAndUpdate(
-    //         {
-    //             'project.id': { $eq: params.project.id },
-    //             name: { $eq: params.name },
-    //             'data.object.transactionNumber': {
-    //                 $exists: true,
-    //                 $eq: String(params.data.object.transactionNumber)
-    //             },
-    //             'data.purpose.orderNumber': {
-    //                 $exists: true,
-    //                 $eq: String(params.data.purpose.orderNumber)
-    //             }
-    //         },
-    //         { $setOnInsert: params },
-    //         { new: true, upsert: true }
-    //     )
-    //         .select({ _id: 1 })
-    //         .exec();
-    //     if (options.emitImmediately) {
-    //         taskEventEmitter.emitTaskStatusChanged({
-    //             id: createdTask.id,
-    //             name: params.name,
-    //             status: factory.taskStatus.Ready
-    //         });
-    //     }
-    // }
     createOnAssetTransactionStatusChangedTaskIfNotExist(
     // resolve uniqueness of identifier(2025-03-27~)
     params, options) {
@@ -458,6 +352,10 @@ class TaskRepo {
             }
         });
     }
+    /**
+     * Ready -> remainingNumberOfTriesが1減る
+     * Running -> findOneするだけ
+     */
     executeOneById(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const now = new Date();
@@ -492,7 +390,7 @@ class TaskRepo {
         });
     }
     /**
-     * support no name(2025-03-04~)
+     * Readyのタスクをname指定でひとつRunningに変更する
      */
     executeOneIfExists(params) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -552,7 +450,11 @@ class TaskRepo {
             return { count };
         });
     }
-    emitRunningIfExists(params) {
+    /**
+     * 実行日時を一定期間過ぎたReadyタスクについて、Runningスタータスに変更した上で、Runningイベントを発生させる
+     */
+    emitRunningIfExists(params, next // support next function(2025-08-02~)
+    ) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b;
             if (!(params.runsAt.$lt instanceof Date)) {
@@ -591,40 +493,55 @@ class TaskRepo {
             task_1.taskEventEmitter.emitTaskStatusChanged({
                 id: doc.id,
                 status: factory.taskStatus.Running
-            });
-            return doc;
-        });
-    }
-    findExecutableOne(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b;
-            if (!(params.runsAt.$lt instanceof Date)) {
-                throw new factory.errors.Argument('runsAt.$lt', 'must be Date');
-            }
-            const nameEq = (_a = params.name) === null || _a === void 0 ? void 0 : _a.$eq;
-            const nameNin = (_b = params.name) === null || _b === void 0 ? void 0 : _b.$nin;
-            const query = this.taskModel.findOne(Object.assign({ status: { $eq: factory.taskStatus.Ready }, runsAt: { $lt: params.runsAt.$lt } }, (typeof nameEq === 'string' || Array.isArray(nameNin))
-                ? {
-                    name: Object.assign(Object.assign({}, (typeof nameEq === 'string') ? { $eq: nameEq } : undefined), (Array.isArray(nameNin)) ? { $nin: nameNin } : undefined)
-                }
-                : undefined), executableTaskProjection)
-                .sort({
-                runsAt: factory.sortType.Ascending
-            });
-            // .hint('executeOneByName');
-            // const explainResult = await query.explain();
-            // console.dir(explainResult, { depth: null });
-            // console.log(explainResult[0].executionStats.allPlansExecution.map((e: any) => e.executionStages.inputStage));
-            const doc = yield query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-                .lean()
-                .exec();
-            if (doc === null) {
-                // tslint:disable-next-line:no-null-keyword
-                return null;
-            }
+            }, (typeof next === 'function') ? next : undefined);
             return doc;
         });
     }
+    // public async findExecutableOne(params: {
+    //     name?: {
+    //         $eq?: factory.taskName;
+    //         $nin?: factory.taskName[];
+    //     };
+    //     runsAt: {
+    //         $lt: Date;
+    //     };
+    // }): Promise<IExecutableTask<factory.taskName> | null> {
+    //     if (!(params.runsAt.$lt instanceof Date)) {
+    //         throw new factory.errors.Argument('runsAt.$lt', 'must be Date');
+    //     }
+    //     const nameEq = params.name?.$eq;
+    //     const nameNin = params.name?.$nin;
+    //     const query = this.taskModel.findOne(
+    //         {
+    //             status: { $eq: factory.taskStatus.Ready },
+    //             runsAt: { $lt: params.runsAt.$lt },
+    //             ...(typeof nameEq === 'string' || Array.isArray(nameNin))
+    //                 ? {
+    //                     name: {
+    //                         ...(typeof nameEq === 'string') ? { $eq: nameEq } : undefined,
+    //                         ...(Array.isArray(nameNin)) ? { $nin: nameNin } : undefined
+    //                     }
+    //                 }
+    //                 : undefined
+    //         },
+    //         executableTaskProjection
+    //     )
+    //         .sort({
+    //             runsAt: factory.sortType.Ascending
+    //         });
+    //     // .hint('executeOneByName');
+    //     // const explainResult = await query.explain();
+    //     // console.dir(explainResult, { depth: null });
+    //     // console.log(explainResult[0].executionStats.allPlansExecution.map((e: any) => e.executionStages.inputStage));
+    //     const doc = await query.setOptions({ maxTimeMS: MONGO_MAX_TIME_MS })
+    //         .lean<IExecutableTask<factory.taskName>>()
+    //         .exec();
+    //     if (doc === null) {
+    //         // tslint:disable-next-line:no-null-keyword
+    //         return null;
+    //     }
+    //     return doc;
+    // }
     // discontinue(2025-05-26~)
     /**
      * emit OnTaskStatusChanged on delayed tasks
@@ -682,7 +599,7 @@ class TaskRepo {
     //     return delayedTasks;
     // }
     /**
-     * make tasks expired
+     * Readyのままで期限切れのタスクをExpiredに変更する
      */
     makeExpiredMany(params) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -702,20 +619,24 @@ class TaskRepo {
         });
     }
     /**
-     * 実行中ステータスのままになっているタスクをリトライする
+     * Runningのまま一定期間超過し、かつ、remainingNumberOfTries>0のタスクをReadyに変更する
      */
-    retry(params) {
+    retryMany(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const lastTriedAtShoudBeLessThan = moment()
                 .add(-params.intervalInMinutes, 'minutes')
                 .toDate();
-            return this.taskModel.updateMany({
+            const remainingNumberOfTriesGt = params.remainingNumberOfTries.$gt;
+            return this.taskModel.updateMany(
+            // name: 'retry'のindexと連動しているので、条件の順序などには注意すること
+            // @see schemas/task
+            {
                 status: { $eq: factory.taskStatus.Running },
                 lastTriedAt: {
                     $type: 'date',
                     $lt: lastTriedAtShoudBeLessThan
                 },
-                remainingNumberOfTries: { $gt: 0 }
+                remainingNumberOfTries: { $gt: remainingNumberOfTriesGt }
             }, {
                 $set: {
                     status: factory.taskStatus.Ready // 実行前に変更
@@ -744,34 +665,42 @@ class TaskRepo {
                 .exec();
         });
     }
-    abortOne(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const lastTriedAtShoudBeLessThan = moment()
-                .add(-params.intervalInMinutes, 'minutes')
-                .toDate();
-            const projection = Object.assign({ _id: 0, id: { $toString: '$_id' } }, Object.fromEntries(AVAILABLE_PROJECT_FIELDS.map((key) => ([key, 1]))));
-            const doc = yield this.taskModel.findOneAndUpdate({
-                status: { $eq: factory.taskStatus.Running },
-                lastTriedAt: {
-                    $type: 'date',
-                    $lt: lastTriedAtShoudBeLessThan
-                },
-                remainingNumberOfTries: { $eq: 0 }
-            }, {
-                $set: {
-                    status: factory.taskStatus.Aborted,
-                    dateAborted: new Date()
-                }
-            }, { new: true, projection })
-                .lean() // lean(2024-09-26~)
-                .exec();
-            if (doc === null) {
-                // tslint:disable-next-line:no-null-keyword
-                return null;
-            }
-            return doc;
-        });
-    }
+    // public async abortOne(params: {
+    //     intervalInMinutes: number;
+    // }): Promise<factory.task.ITask<factory.taskName> | null> {
+    //     const lastTriedAtShoudBeLessThan = moment()
+    //         .add(-params.intervalInMinutes, 'minutes')
+    //         .toDate();
+    //     const projection: ProjectionType<factory.task.ITask<factory.taskName>> = {
+    //         _id: 0,
+    //         id: { $toString: '$_id' },
+    //         ...Object.fromEntries<1>(AVAILABLE_PROJECT_FIELDS.map((key) => ([key, 1])))
+    //     };
+    //     const doc = await this.taskModel.findOneAndUpdate(
+    //         {
+    //             status: { $eq: factory.taskStatus.Running },
+    //             lastTriedAt: {
+    //                 $type: 'date',
+    //                 $lt: lastTriedAtShoudBeLessThan
+    //             },
+    //             remainingNumberOfTries: { $eq: 0 }
+    //         },
+    //         {
+    //             $set: {
+    //                 status: factory.taskStatus.Aborted,
+    //                 dateAborted: new Date()
+    //             }
+    //         },
+    //         { new: true, projection }
+    //     )
+    //         .lean<factory.task.ITask<factory.taskName>>()  // lean(2024-09-26~)
+    //         .exec();
+    //     if (doc === null) {
+    //         // tslint:disable-next-line:no-null-keyword
+    //         return null;
+    //     }
+    //     return doc;
+    // }
     abortMany(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const lastTriedAtShoudBeLessThan = moment()
@@ -794,48 +723,28 @@ class TaskRepo {
         });
     }
     /**
-     * 実行結果を保管する
+     * タスクIDから実行結果とステータスを保管する
+     * Abortedの場合、dateAbortedもセットする
      */
-    pushExecutionResultById(params, executionResult, 
+    setExecutionResultAndStatus(params, update, 
     // support customr function(2025-05-25~)
     next) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { id, status } = params;
+            const { id, remainingNumberOfTries, name } = params;
+            const { status, executionResult } = update;
             yield this.taskModel.updateOne({ _id: { $eq: id } }, {
-                $set: { status },
+                $set: Object.assign({ status }, (status === factory.taskStatus.Aborted) ? { dateAborted: executionResult.endDate } : undefined // 2025-08-04~
+                ),
                 $push: { executionResults: executionResult }
             })
                 .exec();
             // emit event(2025-05-26~)
             if (typeof next === 'function') {
-                task_1.taskEventEmitter.emitTaskStatusChanged({ id, status, executionResult }, next);
+                const changedTask = { id, name, status, remainingNumberOfTries, executionResult };
+                task_1.taskEventEmitter.emitTaskStatusChanged(changedTask, next);
             }
         });
     }
-    /**
-     * 特定タスク検索
-     */
-    // public async findById<T extends factory.taskName>(params: {
-    //     name: T;
-    //     id: string;
-    // }): Promise<factory.task.ITask<T>> {
-    //     const doc = await this.taskModel.findOne(
-    //         {
-    //             name: { $eq: params.name },
-    //             _id: { $eq: params.id }
-    //         },
-    //         {
-    //             __v: 0,
-    //             createdAt: 0,
-    //             updatedAt: 0
-    //         }
-    //     )
-    //         .exec();
-    //     if (doc === null) {
-    //         throw new factory.errors.NotFound('Task');
-    //     }
-    //     return doc.toObject();
-    // }
     count(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const { limit } = params;

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

@@ -1,6 +1,4 @@
 import type { Connection } from 'mongoose';
-import { RedisClientType } from 'redis';
-import { ISetting } from './mongoose/schemas/setting';
 interface IPublishResult {
     transactionNumber: string;
 }
@@ -8,10 +6,8 @@ interface IPublishResult {
  * 取引番号リポジトリ
  */
 export declare class TransactionNumberRepo {
-    private readonly settingModel;
     private readonly counterRepo;
     constructor(params: {
-        redisClient: RedisClientType;
         connection: Connection;
     });
     /**
@@ -20,12 +16,5 @@ export declare class TransactionNumberRepo {
     publishByTimestamp(params: {
         startDate: Date;
     }): Promise<IPublishResult>;
-    /**
-     * DB移行時のみに使用目的の設定更新
-     */
-    setUseMongo4transactionNumberFrom(params: {
-        useMongo4transactionNumberFrom: Date;
-    }): Promise<Pick<ISetting, "useMongo4transactionNumberFrom"> | null>;
-    private useMongoBySettings;
 }
 export {};

package/lib/chevre/repo/transactionNumber.js

@@ -12,9 +12,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.TransactionNumberRepo = void 0;
 const cdigit = require("cdigit");
 const moment = require("moment-timezone");
+// import { RedisClientType } from 'redis';
 // tslint:disable-next-line:no-require-imports no-var-requires
 const fpe = require('node-fpe');
-const setting_1 = require("./mongoose/schemas/setting");
+// import { createSchema as createSettingSchema, modelName as settingModelName } from './mongoose/schemas/setting';
 const transactionNumber_1 = require("./mongoose/schemas/transactionNumber");
 const transactionNumberCounter_1 = require("./transactionNumberCounter");
 /**
@@ -22,8 +23,8 @@ const transactionNumberCounter_1 = require("./transactionNumberCounter");
  */
 class TransactionNumberRepo {
     constructor(params) {
-        const { connection } = params;
-        this.settingModel = connection.model(setting_1.modelName, (0, setting_1.createSchema)());
+        // const { connection } = params;
+        // this.settingModel = connection.model(settingModelName, createSettingSchema());
         this.counterRepo = new transactionNumberCounter_1.TransactionNumberCounterRepo(params);
     }
     // private static createKey(params: {
@@ -47,27 +48,15 @@ class TransactionNumberRepo {
             let dataFeedExpires;
             const dataFeedIdentifier = timestamp;
             let incrReply;
-            const useMongoBySettings = yield this.useMongoBySettings(params);
-            if (useMongoBySettings) {
-                dataFeedExpires = moment(params.startDate)
-                    .add(1, 'minute') // ミリ秒でカウントしていくので、予約日時後1分で十分
-                    .toDate();
-                incrReply = yield this.counterRepo.incrementByMongo({
-                    identifier: dataFeedIdentifier,
-                    includedInDataCatalog: { identifier: transactionNumber_1.DataCatalogIdentifier.transactionNumber },
-                    expires: dataFeedExpires
-                });
-            }
-            else {
-                dataFeedExpires = moment(params.startDate)
-                    .add(1, 'minute') // ミリ秒でカウントしていくので、予約日時後1分で十分
-                    .toDate();
-                incrReply = yield this.counterRepo.incrementByRedis({
-                    identifier: dataFeedIdentifier,
-                    includedInDataCatalog: { identifier: transactionNumber_1.DataCatalogIdentifier.transactionNumber },
-                    expires: dataFeedExpires
-                });
-            }
+            // const useMongoBySettings = await this.useMongoBySettings(params);
+            dataFeedExpires = moment(params.startDate)
+                .add(1, 'minute') // ミリ秒でカウントしていくので、予約日時後1分で十分
+                .toDate();
+            incrReply = yield this.counterRepo.incrementByMongo({
+                identifier: dataFeedIdentifier,
+                includedInDataCatalog: { identifier: transactionNumber_1.DataCatalogIdentifier.transactionNumber },
+                expires: dataFeedExpires
+            });
             let transactionNumber = `${timestamp}${incrReply}`;
             // checkdigit
             const cd = cdigit.luhn.compute(transactionNumber);
@@ -77,32 +66,5 @@ class TransactionNumberRepo {
             return { transactionNumber };
         });
     }
-    /**
-     * DB移行時のみに使用目的の設定更新
-     */
-    setUseMongo4transactionNumberFrom(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { useMongo4transactionNumberFrom } = params;
-            return this.settingModel.findOneAndUpdate({ 'project.id': { $eq: '*' } }, {
-                $set: { useMongo4transactionNumberFrom }
-            }, { projection: { _id: 0, useMongo4transactionNumberFrom: 1 } })
-                .lean()
-                .exec();
-        });
-    }
-    useMongoBySettings(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const setting = yield this.settingModel.findOne({ 'project.id': { $eq: '*' } }, {
-                _id: 0,
-                useMongo4transactionNumberFrom: 1
-            })
-                .lean()
-                .exec();
-            const useMongo4transactionNumberFrom = setting === null || setting === void 0 ? void 0 : setting.useMongo4transactionNumberFrom;
-            return useMongo4transactionNumberFrom instanceof Date
-                && moment(params.startDate)
-                    .isSameOrAfter(moment(useMongo4transactionNumberFrom));
-        });
-    }
 }
 exports.TransactionNumberRepo = TransactionNumberRepo;

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

@@ -1,23 +1,13 @@
 import type { Connection } from 'mongoose';
-import { RedisClientType } from 'redis';
 import { DataCatalogIdentifier } from './mongoose/schemas/transactionNumber';
 /**
  * 取引番号カウンターリポジトリ
  */
 export declare class TransactionNumberCounterRepo {
-    private readonly redisClient;
     private readonly transactionNumberModel;
     constructor(params: {
-        redisClient: RedisClientType;
         connection: Connection;
     });
-    incrementByRedis(params: {
-        identifier: string;
-        includedInDataCatalog: {
-            identifier: DataCatalogIdentifier;
-        };
-        expires: Date;
-    }): Promise<number>;
     incrementByMongo(params: {
         identifier: string;
         includedInDataCatalog: {

package/lib/chevre/repo/transactionNumberCounter.js

@@ -10,6 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TransactionNumberCounterRepo = void 0;
+// import { RedisClientType } from 'redis';
 const errorHandler_1 = require("../errorHandler");
 const factory = require("../factory");
 const transactionNumber_1 = require("./mongoose/schemas/transactionNumber");
@@ -19,37 +20,41 @@ const MAX_RETRY_INCREMENT = 1;
  */
 class TransactionNumberCounterRepo {
     constructor(params) {
-        const { redisClient, connection } = params;
-        this.redisClient = redisClient;
+        const { connection } = params;
+        // this.redisClient = redisClient;
         this.transactionNumberModel = connection.model(transactionNumber_1.modelName, (0, transactionNumber_1.createSchema)());
     }
-    incrementByRedis(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            // const now = moment();
-            const { expires } = params;
-            const key = `${params.includedInDataCatalog.identifier}:${params.identifier}`;
-            // const TTL = moment(expires)
-            //     .diff(now, 'seconds');
-            const [incrReply, expireAtReply] = yield this.redisClient.multi()
-                .incr(key)
-                // .expire(key, TTL)
-                .expireAt(key, expires)
-                .exec();
-            // tslint:disable-next-line:no-single-line-block-comment
-            /* istanbul ignore else: please write tests */
-            if (typeof incrReply !== 'number') {
-                // 基本的にありえないフロー
-                throw new factory.errors.Internal('transaction number not incremented unexpectedly');
-            }
-            // expireAtReplyの検証も追加する(2023-04-19~)
-            const expiredSet = expireAtReply === 1 || expireAtReply === true;
-            if (!expiredSet) {
-                // 基本的にありえないフロー
-                throw new factory.errors.Internal('transaction number expiration not set unexpectedly');
-            }
-            return incrReply;
-        });
-    }
+    // public async incrementByRedis(params: {
+    //     identifier: string;
+    //     includedInDataCatalog: {
+    //         identifier: DataCatalogIdentifier;
+    //     };
+    //     expires: Date;
+    // }): Promise<number> {
+    //     // const now = moment();
+    //     const { expires } = params;
+    //     const key = `${params.includedInDataCatalog.identifier}:${params.identifier}`;
+    //     // const TTL = moment(expires)
+    //     //     .diff(now, 'seconds');
+    //     const [incrReply, expireAtReply] = await this.redisClient.multi()
+    //         .incr(key)
+    //         // .expire(key, TTL)
+    //         .expireAt(key, expires)
+    //         .exec();
+    //     // tslint:disable-next-line:no-single-line-block-comment
+    //     /* istanbul ignore else: please write tests */
+    //     if (typeof incrReply !== 'number') {
+    //         // 基本的にありえないフロー
+    //         throw new factory.errors.Internal('transaction number not incremented unexpectedly');
+    //     }
+    //     // expireAtReplyの検証も追加する(2023-04-19~)
+    //     const expiredSet = expireAtReply === 1 || <any>expireAtReply === true;
+    //     if (!expiredSet) {
+    //         // 基本的にありえないフロー
+    //         throw new factory.errors.Internal('transaction number expiration not set unexpectedly');
+    //     }
+    //     return incrReply;
+    // }
     incrementByMongo(params) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;

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

@@ -18,7 +18,7 @@ export declare function validateStartParams(params: IStartParams): (repos: {
     assetTransaction: AssetTransactionRepo;
 }) => Promise<{
     reserveTransaction: import("@chevre/factory/lib/assetTransaction/reserve").ITransaction | undefined;
-    reservations: (Pick<import("@chevre/factory/lib/reservation/event").IReservation, "id" | "typeOf" | "reservationNumber" | "issuedThrough"> & {
+    reservations: (Pick<import("@chevre/factory/lib/reservation/event").IReservation, "id" | "typeOf" | "issuedThrough" | "reservationNumber"> & {
         reservationFor: Pick<factory.reservation.IReservationFor<factory.reservationType.EventReservation>, "id" | "typeOf">;
     })[] | undefined;
 }>;