@chevre/domain 22.10.0-alpha.16 → 22.10.0-alpha.17

package/example/src/chevre/assetTransaction/processReserve.ts

@@ -18,7 +18,10 @@ async function main() {
     await redisClient.connect();
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
-    const transactionNumberRepo = await chevre.repository.TransactionNumber.createInstance(redisClient);
+    const transactionNumberRepo = await chevre.repository.TransactionNumber.createInstance({
+        redisClient,
+        connection: mongoose.connection
+    });
     const assetTransactionRepo = await chevre.repository.AssetTransaction.createInstance(mongoose.connection);
 
     const { transactionNumber } = await transactionNumberRepo.publishByTimestamp({ startDate: new Date() });

package/example/src/chevre/createTaskIfNotExistByAlternateName.ts

@@ -5,7 +5,7 @@ import { chevre } from '../../../lib/index';
 
 const project = { id: String(process.env.PROJECT_ID) };
 
-chevre.eventEmitter.task.onTaskStatusChanged((event) => {
+chevre.eventEmitter.task.taskEventEmitter.onTaskStatusChanged((event) => {
     console.log('onTaskStatusChanged', event);
 });
 

package/example/src/chevre/{confirmationNumber → transactionNumber}/publishConfimationNumber.ts

@@ -5,7 +5,7 @@ import { chevre } from '../../../../lib/index';
 
 // const project = { id: String(process.env.PROJECT_ID) };
 
-const client = redis.createClient<redis.RedisDefaultModules, Record<string, never>, Record<string, never>>({
+const redisClient = redis.createClient<redis.RedisDefaultModules, Record<string, never>, Record<string, never>>({
     socket: {
         port: Number(<string>process.env.REDIS_PORT),
         host: <string>process.env.REDIS_HOST
@@ -18,11 +18,14 @@ const client = redis.createClient<redis.RedisDefaultModules, Record<string, neve
         console.error('createDefaultRedisClient: client onError:', err);
         // reject(err);
     });
-client.connect();
+redisClient.connect();
 mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
 async function main() {
-    const confirmationNumberRepo = await chevre.repository.ConfirmationNumber.createInstance(client, mongoose.connection);
+    const confirmationNumberRepo = await chevre.repository.ConfirmationNumber.createInstance({
+        redisClient,
+        connection: mongoose.connection
+    });
     const result = await confirmationNumberRepo.publish({ orderDate: new Date() });
     console.log(result);
 }

package/example/src/chevre/transactionNumber/publishOrderNumber.ts

@@ -0,0 +1,40 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+import * as redis from 'redis';
+import { chevre } from '../../../../lib/index';
+
+// const project = { id: String(process.env.PROJECT_ID) };
+
+const redisClient = redis.createClient<redis.RedisDefaultModules, Record<string, never>, Record<string, never>>({
+    socket: {
+        port: Number(<string>process.env.REDIS_PORT),
+        host: <string>process.env.REDIS_HOST
+    },
+    password: <string>process.env.REDIS_KEY,
+    name: 'checkRedisKeyCount'
+})
+    .on('error', (err) => {
+        // eslint-disable-next-line no-console
+        console.error('createDefaultRedisClient: client onError:', err);
+        // reject(err);
+    });
+redisClient.connect();
+mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+async function main() {
+    const orderNumberRepo = await chevre.repository.OrderNumber.createInstance({
+        redisClient,
+        connection: mongoose.connection
+    });
+    const result = await orderNumberRepo.publishByTimestamp({
+        project: { alternateName: 'CIN' },
+        orderDate: new Date()
+    });
+    console.log(result);
+}
+
+main()
+    .then(() => {
+        console.log('success!');
+    })
+    .catch(console.error);

package/example/src/chevre/{confirmationNumber → transactionNumber}/setUseMongo4confirmationNumberFrom.ts

@@ -6,7 +6,7 @@ import { chevre } from '../../../../lib/index';
 
 // const project = { id: String(process.env.PROJECT_ID) };
 
-const client = redis.createClient<redis.RedisDefaultModules, Record<string, never>, Record<string, never>>({
+const redisClient = redis.createClient<redis.RedisDefaultModules, Record<string, never>, Record<string, never>>({
     socket: {
         port: Number(<string>process.env.REDIS_PORT),
         host: <string>process.env.REDIS_HOST
@@ -19,18 +19,21 @@ const client = redis.createClient<redis.RedisDefaultModules, Record<string, neve
         console.error('createDefaultRedisClient: client onError:', err);
         // reject(err);
     });
-client.connect();
+redisClient.connect();
 mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
 async function main() {
-    const confirmationNumberRepo = await chevre.repository.ConfirmationNumber.createInstance(client, mongoose.connection);
+    const confirmationNumberRepo = await chevre.repository.ConfirmationNumber.createInstance({
+        redisClient,
+        connection: mongoose.connection
+    });
     const result = await confirmationNumberRepo.setUseMongo4confirmationNumberFrom({
         // useMongo4confirmationNumberFrom: moment('2025-05-22T23:50:00Z')
         //     .toDate(),
-        useMongo4confirmationNumberFrom: moment('2025-05-25T15:00:00Z')
-            .toDate()
-        // useMongo4confirmationNumberFrom: moment('2025-05-31T15:00:00Z')
+        // useMongo4confirmationNumberFrom: moment('2025-05-25T15:00:00Z')
         //     .toDate()
+        useMongo4confirmationNumberFrom: moment('2025-05-31T15:00:00Z')
+            .toDate()
     });
     console.log(result);
 }

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

@@ -1,10 +1,12 @@
 import { EventEmitter } from 'events';
 import * as factory from '../factory';
+type ICustomFunction = () => Promise<void>;
 interface IListenArgsOnTaskStatusChanged {
     id: string;
     name?: factory.taskName;
     status: factory.taskStatus.Ready | factory.taskStatus.Running;
     expires?: Date;
+    customFunction?: ICustomFunction;
 }
 type IOnTaskStatusChangedListener = (listenArgs: IListenArgsOnTaskStatusChanged) => void;
 /**
@@ -15,4 +17,4 @@ declare class TaskEventEmitter extends EventEmitter {
     emitTaskStatusChanged(args: IListenArgsOnTaskStatusChanged): void;
 }
 declare const taskEventEmitter: TaskEventEmitter;
-export { IOnTaskStatusChangedListener, taskEventEmitter };
+export { ICustomFunction, IListenArgsOnTaskStatusChanged, IOnTaskStatusChangedListener, taskEventEmitter };

package/lib/chevre/eventEmitter.d.ts

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

package/lib/chevre/eventEmitter.js

@@ -3,7 +3,7 @@ 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 task = require("./eventEmitter/task");
+exports.task = task;
 const transaction_1 = require("./eventEmitter/transaction");
 Object.defineProperty(exports, "transaction", { enumerable: true, get: function () { return transaction_1.transactionEventEmitter; } });

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

@@ -5,13 +5,13 @@ import { ISetting } from './mongoose/schemas/setting';
  * 確認番号リポジトリ
  */
 export declare class ConfirmationNumberRepo {
-    private static readonly REDIS_KEY_PREFIX_NEW;
-    private readonly redisClient;
     private readonly settingModel;
-    private readonly transactionNumberModel;
-    constructor(redisClient: RedisClientType, connection: Connection);
+    private readonly counterRepo;
+    constructor(params: {
+        redisClient: RedisClientType;
+        connection: Connection;
+    });
     private static alignDigits;
-    private static createKey;
     private static createDataFeedIdentifier;
     private static count2confirmationNumber;
     /**
@@ -26,9 +26,5 @@ export declare class ConfirmationNumberRepo {
     setUseMongo4confirmationNumberFrom(params: {
         useMongo4confirmationNumberFrom: Date;
     }): Promise<Pick<ISetting, "useMongo4confirmationNumberFrom"> | null>;
-    /**
-     * 発行する
-     */
-    private publishByMongo;
     private useMongoBySettings;
 }

package/lib/chevre/repo/confirmationNumber.js

@@ -12,24 +12,21 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConfirmationNumberRepo = void 0;
 const cdigit = require("cdigit");
 const moment = require("moment-timezone");
-const util = require("util");
 // tslint:disable-next-line:no-require-imports no-var-requires
 const fpe = require('node-fpe');
-const errorHandler_1 = require("../errorHandler");
-const factory = require("../factory");
 const setting_1 = require("./mongoose/schemas/setting");
 const transactionNumber_1 = require("./mongoose/schemas/transactionNumber");
+const transactionNumberCounter_1 = require("./transactionNumberCounter");
 const CONFIRMATION_NUMBER_MIN_LENGH = 4;
 const TIMEZONE = 'Asia/Tokyo';
-const MAX_RETRY_INCREMENT = 1;
 /**
  * 確認番号リポジトリ
  */
 class ConfirmationNumberRepo {
-    constructor(redisClient, connection) {
-        this.redisClient = redisClient;
+    constructor(params) {
+        const { connection } = params;
         this.settingModel = connection.model(setting_1.modelName, (0, setting_1.createSchema)());
-        this.transactionNumberModel = connection.model(transactionNumber_1.modelName, (0, transactionNumber_1.createSchema)());
+        this.counterRepo = new transactionNumberCounter_1.TransactionNumberCounterRepo(params);
     }
     static alignDigits(params) {
         let aligndNumber = String(params);
@@ -39,11 +36,17 @@ class ConfirmationNumberRepo {
         }
         return aligndNumber;
     }
-    static createKey(params) {
-        return util.format('%s:%s', ConfirmationNumberRepo.REDIS_KEY_PREFIX_NEW, moment(params.orderDate)
-            .tz(TIMEZONE)
-            .format('YYMM'));
-    }
+    // private static createKey(params: {
+    //     orderDate: Date;
+    // }): string {
+    //     return util.format(
+    //         '%s:%s',
+    //         ConfirmationNumberRepo.REDIS_KEY_PREFIX_NEW,
+    //         moment(params.orderDate)
+    //             .tz(TIMEZONE)
+    //             .format('YYMM')
+    //     );
+    // }
     static createDataFeedIdentifier(params) {
         return moment(params.orderDate)
             .tz(TIMEZONE)
@@ -65,25 +68,33 @@ class ConfirmationNumberRepo {
      */
     publish(params) {
         return __awaiter(this, void 0, void 0, function* () {
+            let dataFeedExpires;
+            const dataFeedIdentifier = ConfirmationNumberRepo.createDataFeedIdentifier({ orderDate: params.orderDate });
+            let incrReply;
             // support publishByMongo(2025-05-23~)
             const useMongoBySettings = yield this.useMongoBySettings(params);
             if (useMongoBySettings) {
-                return this.publishByMongo(params);
+                // データ保管期間はとりあえず2 months
+                dataFeedExpires = moment(params.orderDate)
+                    // tslint:disable-next-line:no-magic-numbers
+                    .add(2, 'months')
+                    .toDate();
+                incrReply = yield this.counterRepo.incrementByMongo({
+                    identifier: dataFeedIdentifier,
+                    includedInDataCatalog: { identifier: transactionNumber_1.DataCatalogIdentifier.confirmationNumber },
+                    expires: dataFeedExpires
+                });
             }
-            // データ保管期間はとりあえず一か月
-            const TTL = moment(params.orderDate)
-                .add(1, 'month')
-                .diff(moment(params.orderDate), 'seconds');
-            const key = ConfirmationNumberRepo.createKey({ orderDate: params.orderDate });
-            const [incrReply] = yield this.redisClient.multi()
-                .incr(key)
-                .expire(key, TTL)
-                .exec();
-            // tslint:disable-next-line:no-single-line-block-comment
-            /* istanbul ignore if */
-            if (typeof incrReply !== 'number') {
-                // 基本的にありえないフロー
-                throw new factory.errors.Internal('confirmation number not incremented unexpectedly');
+            else {
+                // データ保管期間はとりあえず一か月
+                dataFeedExpires = moment(params.orderDate)
+                    .add(1, 'month')
+                    .toDate();
+                incrReply = yield this.counterRepo.incrementByRedis({
+                    identifier: dataFeedIdentifier,
+                    includedInDataCatalog: { identifier: transactionNumber_1.DataCatalogIdentifier.confirmationNumber },
+                    expires: dataFeedExpires
+                });
             }
             return ConfirmationNumberRepo.count2confirmationNumber({ count: incrReply });
         });
@@ -101,86 +112,6 @@ class ConfirmationNumberRepo {
                 .exec();
         });
     }
-    /**
-     * 発行する
-     */
-    publishByMongo(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const now = new Date();
-            // データ保管期間はとりあえず2 months
-            const dataFeedExpires = moment(params.orderDate)
-                // tslint:disable-next-line:no-magic-numbers
-                .add(2, 'months')
-                .toDate();
-            const dataFeedIdentifier = ConfirmationNumberRepo.createDataFeedIdentifier({ orderDate: params.orderDate });
-            const dataFeed = {
-                typeOf: 'DataFeed',
-                includedInDataCatalog: {
-                    identifier: transactionNumber_1.DataCatalogIdentifier.confirmationNumber,
-                    typeOf: 'DataCatalog'
-                },
-                dateCreated: now,
-                expires: dataFeedExpires,
-                identifier: dataFeedIdentifier,
-                interactionStatistic: {
-                    typeOf: 'InteractionCounter',
-                    userInteractionCount: 0
-                },
-                project: { id: '*', typeOf: factory.organizationType.Project }
-            };
-            const { typeOf, includedInDataCatalog, dateCreated, expires, identifier, project, interactionStatistic } = dataFeed;
-            let doc;
-            let retryCount = 0;
-            while (retryCount <= MAX_RETRY_INCREMENT) {
-                try {
-                    doc = yield this.transactionNumberModel.findOneAndUpdate({
-                        'project.id': { $eq: dataFeed.project.id },
-                        'includedInDataCatalog.identifier': { $eq: dataFeed.includedInDataCatalog.identifier },
-                        identifier: { $eq: dataFeed.identifier }
-                    }, {
-                        $set: {
-                            dateModified: now
-                        },
-                        $setOnInsert: {
-                            typeOf, includedInDataCatalog, dateCreated, expires, identifier, project,
-                            'interactionStatistic.typeOf': interactionStatistic.typeOf
-                        },
-                        $inc: {
-                            'interactionStatistic.userInteractionCount': 1
-                        }
-                    }, {
-                        upsert: true,
-                        new: true,
-                        projection: { _id: 0, interactionStatistic: 1 }
-                    })
-                        .lean()
-                        .exec();
-                    break;
-                }
-                catch (error) {
-                    if (yield (0, errorHandler_1.isMongoError)(error)) {
-                        if (error.code === errorHandler_1.MongoErrorCode.DuplicateKey) {
-                            // すでに存在するので、リトライすればincrementに成功するはず
-                            retryCount += 1;
-                            continue;
-                        }
-                    }
-                    throw error;
-                }
-            }
-            if (doc === undefined) {
-                throw new factory.errors.NotFound('DataFeed');
-            }
-            const incrReply = doc.interactionStatistic.userInteractionCount;
-            // tslint:disable-next-line:no-single-line-block-comment
-            /* istanbul ignore if */
-            if (typeof incrReply !== 'number') {
-                // 基本的にありえないフロー
-                throw new factory.errors.Internal('confirmation number not incremented unexpectedly');
-            }
-            return ConfirmationNumberRepo.count2confirmationNumber({ count: incrReply });
-        });
-    }
     useMongoBySettings(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const setting = yield this.settingModel.findOne({ 'project.id': { $eq: '*' } }, {
@@ -197,4 +128,3 @@ class ConfirmationNumberRepo {
     }
 }
 exports.ConfirmationNumberRepo = ConfirmationNumberRepo;
-ConfirmationNumberRepo.REDIS_KEY_PREFIX_NEW = 'confirmationNumber';

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

@@ -123,6 +123,8 @@ export interface ISetting {
     useMongoAsStockHolder?: boolean;
     useMongoAsStockHolderProjects?: string[];
     useMongo4confirmationNumberFrom?: Date;
+    useMongo4orderNumberFrom?: Date;
+    useMongo4transactionNumberFrom?: Date;
 }
 type IDocType = ISetting;
 type IModel = Model<IDocType>;

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

@@ -1,7 +1,10 @@
 import { Model, Schema, SchemaDefinition } from 'mongoose';
 import * as factory from '../../../factory';
 declare enum DataCatalogIdentifier {
-    confirmationNumber = "confirmationNumber"
+    confirmationNumber = "confirmationNumber",
+    transactionNumber = "transactionNumber",
+    orderNumber = "orderNumber",
+    serviceOutputIdentifier = "serviceOutputIdentifier"
 }
 interface IDataCatalog {
     identifier: DataCatalogIdentifier;

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

@@ -8,6 +8,9 @@ const settings_1 = require("../../../settings");
 var DataCatalogIdentifier;
 (function (DataCatalogIdentifier) {
     DataCatalogIdentifier["confirmationNumber"] = "confirmationNumber";
+    DataCatalogIdentifier["transactionNumber"] = "transactionNumber";
+    DataCatalogIdentifier["orderNumber"] = "orderNumber";
+    DataCatalogIdentifier["serviceOutputIdentifier"] = "serviceOutputIdentifier";
 })(DataCatalogIdentifier || (exports.DataCatalogIdentifier = DataCatalogIdentifier = {}));
 const modelName = 'TransactionNumber';
 exports.modelName = modelName;

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

@@ -1,12 +1,15 @@
+import type { Connection } from 'mongoose';
 import { RedisClientType } from 'redis';
 /**
  * 注文番号リポジトリ
  */
 export declare class OrderNumberRepo {
-    private static readonly REDIS_KEY_PREFIX;
-    private readonly redisClient;
-    constructor(redisClient: RedisClientType);
-    private static createKey;
+    private readonly settingModel;
+    private readonly counterRepo;
+    constructor(params: {
+        redisClient: RedisClientType;
+        connection: Connection;
+    });
     /**
      * タイムスタンプから発行する
      */
@@ -19,4 +22,5 @@ export declare class OrderNumberRepo {
          */
         orderDate: Date;
     }): Promise<string>;
+    private useMongoBySettings;
 }

package/lib/chevre/repo/orderNumber.js

@@ -12,45 +12,60 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.OrderNumberRepo = void 0;
 const cdigit = require("cdigit");
 const moment = require("moment-timezone");
-const util = require("util");
 // tslint:disable-next-line:no-require-imports no-var-requires
 const fpe = require('node-fpe');
 const factory = require("../factory");
+const setting_1 = require("./mongoose/schemas/setting");
+const transactionNumber_1 = require("./mongoose/schemas/transactionNumber");
+const transactionNumberCounter_1 = require("./transactionNumberCounter");
 const ORDER_NUMBER_SEPARATOR = '-';
 /**
  * 注文番号リポジトリ
  */
 class OrderNumberRepo {
-    constructor(redisClient) {
-        this.redisClient = redisClient;
-    }
-    static createKey(params) {
-        return util.format('%s:%s:%s', OrderNumberRepo.REDIS_KEY_PREFIX, params.projectPrefix, params.timestamp);
+    constructor(params) {
+        const { connection } = params;
+        this.settingModel = connection.model(setting_1.modelName, (0, setting_1.createSchema)());
+        this.counterRepo = new transactionNumberCounter_1.TransactionNumberCounterRepo(params);
     }
+    // private static createKey(params: {
+    //     orderDate: Date;
+    //     projectPrefix: string;
+    //     timestamp: string;
+    // }): string {
+    //     return util.format(
+    //         '%s:%s:%s',
+    //         OrderNumberRepo.REDIS_KEY_PREFIX,
+    //         params.projectPrefix,
+    //         params.timestamp
+    //     );
+    // }
     /**
      * タイムスタンプから発行する
      */
     publishByTimestamp(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const projectPrefix = params.project.alternateName
-                .toUpperCase();
             const timestamp = moment(params.orderDate)
                 .valueOf()
                 .toString();
-            const now = moment();
-            const TTL = moment(params.orderDate)
-                .add(1, 'minute') // ミリ秒でカウントしていくので、注文日時後1分で十分
-                .diff(now, 'seconds');
-            const key = OrderNumberRepo.createKey({ orderDate: params.orderDate, projectPrefix, timestamp });
-            const [incrReply] = yield this.redisClient.multi()
-                .incr(key)
-                .expire(key, TTL)
-                .exec();
-            // tslint:disable-next-line:no-single-line-block-comment
-            /* istanbul ignore if */
-            if (typeof incrReply !== 'number') {
-                // 基本的にありえないフロー
-                throw new factory.errors.Internal('order number not incremented unexpectedly');
+            const projectPrefix = params.project.alternateName
+                .toUpperCase();
+            let dataFeedExpires;
+            const dataFeedIdentifier = `${projectPrefix}:${timestamp}`;
+            let incrReply;
+            const useMongoBySettings = yield this.useMongoBySettings(params);
+            if (useMongoBySettings) {
+                throw new factory.errors.NotImplemented();
+            }
+            else {
+                dataFeedExpires = moment(params.orderDate)
+                    .add(1, 'minute') // ミリ秒でカウントしていくので、注文日時後1分で十分
+                    .toDate();
+                incrReply = yield this.counterRepo.incrementByRedis({
+                    identifier: dataFeedIdentifier,
+                    includedInDataCatalog: { identifier: transactionNumber_1.DataCatalogIdentifier.orderNumber },
+                    expires: dataFeedExpires
+                });
             }
             let orderNumber = `${timestamp}${incrReply}`;
             // checkdigit
@@ -69,6 +84,19 @@ class OrderNumberRepo {
             return orderNumber;
         });
     }
+    useMongoBySettings(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const setting = yield this.settingModel.findOne({ 'project.id': { $eq: '*' } }, {
+                _id: 0,
+                useMongo4orderNumberFrom: 1
+            })
+                .lean()
+                .exec();
+            const useMongo4orderNumberFrom = setting === null || setting === void 0 ? void 0 : setting.useMongo4orderNumberFrom;
+            return useMongo4orderNumberFrom instanceof Date
+                && moment(params.orderDate)
+                    .isSameOrAfter(moment(useMongo4orderNumberFrom));
+        });
+    }
 }
 exports.OrderNumberRepo = OrderNumberRepo;
-OrderNumberRepo.REDIS_KEY_PREFIX = 'orderNumber';

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

@@ -1,16 +1,20 @@
+import type { Connection } from 'mongoose';
 import { RedisClientType } from 'redis';
 /**
  * サービスアウトプット識別子リポジトリ
  */
 export declare class ServiceOutputIdentifierRepo {
-    private static readonly REDIS_KEY_PREFIX;
-    private readonly redisClient;
-    constructor(redisClient: RedisClientType);
-    private static createKey;
+    private readonly settingModel;
+    private readonly counterRepo;
+    constructor(params: {
+        redisClient: RedisClientType;
+        connection: Connection;
+    });
     /**
      * タイムスタンプから発行する
      */
     publishByTimestamp(params: {
         startDate: Date;
     }): Promise<string>;
+    private useMongoBySettings;
 }

package/lib/chevre/repo/serviceOutputIdentifier.js

@@ -12,20 +12,31 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ServiceOutputIdentifierRepo = void 0;
 const cdigit = require("cdigit");
 const moment = require("moment-timezone");
-const util = require("util");
 // tslint:disable-next-line:no-require-imports no-var-requires
 const fpe = require('node-fpe');
 const factory = require("../factory");
+const setting_1 = require("./mongoose/schemas/setting");
+const transactionNumber_1 = require("./mongoose/schemas/transactionNumber");
+const transactionNumberCounter_1 = require("./transactionNumberCounter");
 /**
  * サービスアウトプット識別子リポジトリ
  */
 class ServiceOutputIdentifierRepo {
-    constructor(redisClient) {
-        this.redisClient = redisClient;
-    }
-    static createKey(params) {
-        return util.format('%s:%s', ServiceOutputIdentifierRepo.REDIS_KEY_PREFIX, params.timestamp);
+    constructor(params) {
+        const { connection } = params;
+        this.settingModel = connection.model(setting_1.modelName, (0, setting_1.createSchema)());
+        this.counterRepo = new transactionNumberCounter_1.TransactionNumberCounterRepo(params);
     }
+    // private static createKey(params: {
+    //     startDate: Date;
+    //     timestamp: string;
+    // }): string {
+    //     return util.format(
+    //         '%s:%s',
+    //         ServiceOutputIdentifierRepo.REDIS_KEY_PREFIX,
+    //         params.timestamp
+    //     );
+    // }
     /**
      * タイムスタンプから発行する
      */
@@ -34,20 +45,22 @@ class ServiceOutputIdentifierRepo {
             const timestamp = moment(params.startDate)
                 .valueOf()
                 .toString();
-            const now = moment();
-            const TTL = moment(params.startDate)
-                .add(1, 'minute') // ミリ秒でカウントしていくので、予約日時後1分で十分
-                .diff(now, 'seconds');
-            const key = ServiceOutputIdentifierRepo.createKey({ startDate: params.startDate, timestamp });
-            const [incrReply] = yield this.redisClient.multi()
-                .incr(key)
-                .expire(key, TTL)
-                .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('serviceOutput identifier not incremented unexpectedly');
+            let dataFeedExpires;
+            const dataFeedIdentifier = timestamp;
+            let incrReply;
+            const useMongoBySettings = yield this.useMongoBySettings(params);
+            if (useMongoBySettings) {
+                throw new factory.errors.NotImplemented();
+            }
+            else {
+                dataFeedExpires = moment(params.startDate)
+                    .add(1, 'minute') // ミリ秒でカウントしていくので、予約日時後1分で十分
+                    .toDate();
+                incrReply = yield this.counterRepo.incrementByRedis({
+                    identifier: dataFeedIdentifier,
+                    includedInDataCatalog: { identifier: transactionNumber_1.DataCatalogIdentifier.serviceOutputIdentifier },
+                    expires: dataFeedExpires
+                });
             }
             let identifier = `${timestamp}${incrReply}`;
             // checkdigit
@@ -58,6 +71,19 @@ class ServiceOutputIdentifierRepo {
             return identifier;
         });
     }
+    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.ServiceOutputIdentifierRepo = ServiceOutputIdentifierRepo;
-ServiceOutputIdentifierRepo.REDIS_KEY_PREFIX = 'serviceOutputIdentifier';

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

@@ -1,4 +1,5 @@
 import type { AnyKeys, Connection, FilterQuery, ProjectionType, UpdateWriteOpResult } from 'mongoose';
+import { IListenArgsOnTaskStatusChanged } from '../eventEmitter/task';
 import * as factory from '../factory';
 import { IModel } from './mongoose/schemas/task';
 interface IAggregationByStatus {
@@ -36,7 +37,8 @@ export declare class TaskRepo {
     runImmediately(params: Pick<factory.task.IAttributes<factory.taskName>, 'data' | 'expires' | 'name' | 'project' | 'remainingNumberOfTries' | 'runsAt'> & {
         alternateName?: never;
         identifier?: never;
-    }): Promise<{
+        expires: Date;
+    }, options: Pick<IListenArgsOnTaskStatusChanged, 'customFunction'>): Promise<{
         id: string;
     }>;
     saveMany(taskAttributes: ICreatingTask[], options: IOptionOnCreate): Promise<{

package/lib/chevre/repo/task.js

@@ -156,7 +156,9 @@ class TaskRepo {
     }
     runImmediately(
     // resolve uniqueness of identifier(2025-03-27~)
-    params) {
+    params, 
+    // support customr function(2025-05-25~)
+    options) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b;
             const { expires } = params;
@@ -169,11 +171,7 @@ class TaskRepo {
             if (typeof id !== 'string') {
                 throw new factory.errors.Internal('task not saved');
             }
-            task_1.taskEventEmitter.emitTaskStatusChanged({
-                id,
-                status: factory.taskStatus.Ready,
-                expires // emit expires(2025-03-31~)
-            });
+            task_1.taskEventEmitter.emitTaskStatusChanged(Object.assign({ id, status: factory.taskStatus.Ready, expires }, (typeof options.customFunction === 'function') ? { customFunction: options.customFunction } : undefined));
             return { id };
         });
     }

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

@@ -1,3 +1,4 @@
+import type { Connection } from 'mongoose';
 import { RedisClientType } from 'redis';
 interface IPublishResult {
     transactionNumber: string;
@@ -6,15 +7,18 @@ interface IPublishResult {
  * 取引番号リポジトリ
  */
 export declare class TransactionNumberRepo {
-    private static readonly REDIS_KEY_PREFIX;
-    private readonly redisClient;
-    constructor(redisClient: RedisClientType);
-    private static createKey;
+    private readonly settingModel;
+    private readonly counterRepo;
+    constructor(params: {
+        redisClient: RedisClientType;
+        connection: Connection;
+    });
     /**
      * タイムスタンプから発行する
      */
     publishByTimestamp(params: {
         startDate: Date;
     }): Promise<IPublishResult>;
+    private useMongoBySettings;
 }
 export {};

package/lib/chevre/repo/transactionNumber.js

@@ -12,20 +12,31 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.TransactionNumberRepo = void 0;
 const cdigit = require("cdigit");
 const moment = require("moment-timezone");
-const util = require("util");
 // tslint:disable-next-line:no-require-imports no-var-requires
 const fpe = require('node-fpe');
 const factory = require("../factory");
+const setting_1 = require("./mongoose/schemas/setting");
+const transactionNumber_1 = require("./mongoose/schemas/transactionNumber");
+const transactionNumberCounter_1 = require("./transactionNumberCounter");
 /**
  * 取引番号リポジトリ
  */
 class TransactionNumberRepo {
-    constructor(redisClient) {
-        this.redisClient = redisClient;
-    }
-    static createKey(params) {
-        return util.format('%s:%s', TransactionNumberRepo.REDIS_KEY_PREFIX, params.timestamp);
+    constructor(params) {
+        const { connection } = params;
+        this.settingModel = connection.model(setting_1.modelName, (0, setting_1.createSchema)());
+        this.counterRepo = new transactionNumberCounter_1.TransactionNumberCounterRepo(params);
     }
+    // private static createKey(params: {
+    //     startDate: Date;
+    //     timestamp: string;
+    // }): string {
+    //     return util.format(
+    //         '%s:%s',
+    //         TransactionNumberRepo.REDIS_KEY_PREFIX,
+    //         params.timestamp
+    //     );
+    // }
     /**
      * タイムスタンプから発行する
      */
@@ -34,20 +45,22 @@ class TransactionNumberRepo {
             const timestamp = moment(params.startDate)
                 .valueOf()
                 .toString();
-            const now = moment();
-            const TTL = moment(params.startDate)
-                .add(1, 'minute') // ミリ秒でカウントしていくので、予約日時後1分で十分
-                .diff(now, 'seconds');
-            const key = TransactionNumberRepo.createKey({ startDate: params.startDate, timestamp });
-            const [incrReply] = yield this.redisClient.multi()
-                .incr(key)
-                .expire(key, TTL)
-                .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');
+            let dataFeedExpires;
+            const dataFeedIdentifier = timestamp;
+            let incrReply;
+            const useMongoBySettings = yield this.useMongoBySettings(params);
+            if (useMongoBySettings) {
+                throw new factory.errors.NotImplemented();
+            }
+            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
+                });
             }
             let transactionNumber = `${timestamp}${incrReply}`;
             // checkdigit
@@ -58,6 +71,19 @@ class TransactionNumberRepo {
             return { transactionNumber };
         });
     }
+    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;
-TransactionNumberRepo.REDIS_KEY_PREFIX = 'transactionNumber';

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

@@ -0,0 +1,28 @@
+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: {
+            identifier: DataCatalogIdentifier;
+        };
+        expires: Date;
+    }): Promise<number>;
+}

package/lib/chevre/repo/transactionNumberCounter.js

@@ -0,0 +1,128 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TransactionNumberCounterRepo = void 0;
+const errorHandler_1 = require("../errorHandler");
+const factory = require("../factory");
+const transactionNumber_1 = require("./mongoose/schemas/transactionNumber");
+const MAX_RETRY_INCREMENT = 1;
+/**
+ * 取引番号カウンターリポジトリ
+ */
+class TransactionNumberCounterRepo {
+    constructor(params) {
+        const { redisClient, 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;
+        });
+    }
+    incrementByMongo(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a;
+            const now = new Date();
+            const dataFeedExpires = params.expires;
+            const dataFeedIdentifier = params.identifier;
+            const dataFeed = {
+                typeOf: 'DataFeed',
+                includedInDataCatalog: {
+                    identifier: params.includedInDataCatalog.identifier,
+                    typeOf: 'DataCatalog'
+                },
+                dateCreated: now,
+                expires: dataFeedExpires,
+                identifier: dataFeedIdentifier,
+                interactionStatistic: {
+                    typeOf: 'InteractionCounter',
+                    userInteractionCount: 0
+                },
+                project: { id: '*', typeOf: factory.organizationType.Project }
+            };
+            const { typeOf, includedInDataCatalog, dateCreated, expires, identifier, project, interactionStatistic } = dataFeed;
+            let doc;
+            let retryCount = 0;
+            while (retryCount <= MAX_RETRY_INCREMENT) {
+                try {
+                    doc = yield this.transactionNumberModel.findOneAndUpdate({
+                        'project.id': { $eq: dataFeed.project.id },
+                        'includedInDataCatalog.identifier': { $eq: dataFeed.includedInDataCatalog.identifier },
+                        identifier: { $eq: dataFeed.identifier }
+                    }, {
+                        $set: {
+                            dateModified: now
+                        },
+                        $setOnInsert: {
+                            typeOf, includedInDataCatalog, dateCreated, expires, identifier, project,
+                            'interactionStatistic.typeOf': interactionStatistic.typeOf
+                        },
+                        $inc: {
+                            'interactionStatistic.userInteractionCount': 1
+                        }
+                    }, {
+                        upsert: true,
+                        new: true,
+                        projection: { _id: 0, interactionStatistic: 1 }
+                    })
+                        .lean()
+                        .exec();
+                    break;
+                }
+                catch (error) {
+                    if (yield (0, errorHandler_1.isMongoError)(error)) {
+                        if (error.code === errorHandler_1.MongoErrorCode.DuplicateKey) {
+                            // すでに存在するので、リトライすればincrementに成功するはず
+                            retryCount += 1;
+                            continue;
+                        }
+                    }
+                    throw error;
+                }
+            }
+            if (doc === undefined) {
+                throw new factory.errors.NotFound('DataFeed');
+            }
+            const incrReply = (_a = doc.interactionStatistic) === null || _a === void 0 ? void 0 : _a.userInteractionCount;
+            // tslint:disable-next-line:no-single-line-block-comment
+            /* istanbul ignore if */
+            if (typeof incrReply !== 'number') {
+                // 基本的にありえないフロー
+                throw new factory.errors.Internal('confirmation number not incremented unexpectedly');
+            }
+            return incrReply;
+        });
+    }
+}
+exports.TransactionNumberCounterRepo = TransactionNumberCounterRepo;

package/lib/chevre/service/offer/product.js

@@ -388,43 +388,3 @@ function createServiceOutputIdentifier(params) {
         })));
     });
 }
-// function processLockRegisterMembershipService(params: {
-//     agent: { id: string };
-//     product: factory.product.IProduct;
-//     purpose: factory.action.authorize.offer.product.IPurpose;
-// }) {
-//     return async (repos: {
-//         registerActionInProgress: RegisterServiceInProgressRepo;
-//     }) => {
-//         if (params.product.typeOf === factory.product.ProductType.MembershipService) {
-//             await repos.registerActionInProgress.lock(
-//                 {
-//                     agent: { id: params.agent.id },
-//                     product: { id: String(params.product.id) }
-//                 },
-//                 params.purpose.id
-//             );
-//         }
-//     };
-// }
-// export function processUnlockRegisterMembershipService(params: {
-//     agent: { id: string };
-//     product: { id: string };
-//     purpose: factory.action.authorize.offer.product.IPurpose;
-// }) {
-//     return async (repos: {
-//         registerActionInProgress: RegisterServiceInProgressRepo;
-//     }) => {
-//         // 登録ロックIDが取引IDであればロック解除
-//         const holder = await repos.registerActionInProgress.getHolder({
-//             agent: { id: params.agent.id },
-//             product: { id: params.product.id }
-//         });
-//         if (holder === params.purpose.id) {
-//             await repos.registerActionInProgress.unlock({
-//                 agent: { id: params.agent.id },
-//                 product: { id: params.product.id }
-//             });
-//         }
-//     };
-// }

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

@@ -86,7 +86,7 @@ function call(params) {
                 })({
                     action: actionRepo,
                     event: new event_1.EventRepo(connection),
-                    orderNumber: new orderNumber_1.OrderNumberRepo(redisClient),
+                    orderNumber: new orderNumber_1.OrderNumberRepo({ redisClient, connection }),
                     project: new project_1.ProjectRepo(connection),
                     transaction: new transaction_1.TransactionRepo(connection),
                     reserveService,
@@ -104,7 +104,7 @@ function call(params) {
                 })({
                     action: actionRepo,
                     event: new event_1.EventRepo(connection),
-                    orderNumber: new orderNumber_1.OrderNumberRepo(redisClient),
+                    orderNumber: new orderNumber_1.OrderNumberRepo({ redisClient, connection }),
                     project: new project_1.ProjectRepo(connection),
                     transaction: new transaction_1.TransactionRepo(connection),
                     reserveService,

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

@@ -57,13 +57,13 @@ function call(params) {
                 action: actionRepo,
                 assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
                 authorization: new authorization_1.AuthorizationRepo(connection),
-                confirmationNumber: new confirmationNumber_1.ConfirmationNumberRepo(redisClient, connection),
+                confirmationNumber: new confirmationNumber_1.ConfirmationNumberRepo({ redisClient, connection }),
                 credentials: new credentials_1.CredentialsRepo(redisClient, {
                     scope: `${factory.service.paymentService.PaymentServiceType.MovieTicket}:${paymentServiceId}`,
                     expireInSeconds: (useCredentialsRepo) ? credentialsExpireInSeconds : 0
                 }),
                 event: new event_1.EventRepo(connection),
-                orderNumber: new orderNumber_1.OrderNumberRepo(redisClient),
+                orderNumber: new orderNumber_1.OrderNumberRepo({ redisClient, connection }),
                 paymentAccepted: new sellerPaymentAccepted_1.SellerPaymentAcceptedRepo(connection),
                 paymentService: new paymentService_1.PaymentServiceRepo(connection),
                 paymentServiceProvider: new paymentServiceProvider_1.PaymentServiceProviderRepo(connection),
@@ -73,7 +73,7 @@ function call(params) {
                 task: new task_1.TaskRepo(connection),
                 ticket: new ticket_1.TicketRepo(connection),
                 transaction: new transaction_1.TransactionRepo(connection),
-                transactionNumber: new transactionNumber_1.TransactionNumberRepo(redisClient),
+                transactionNumber: new transactionNumber_1.TransactionNumberRepo({ redisClient, connection }),
                 transactionProcess: transactionProcessRepo
             }, settings);
         }

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

@@ -29,7 +29,7 @@ function call(data) {
         const assetTransactionRepo = new assetTransaction_1.AssetTransactionRepo(connection);
         const productRepo = new product_1.ProductRepo(connection);
         const projectRepo = new project_1.ProjectRepo(connection);
-        const transactionNumberRepo = new transactionNumber_1.TransactionNumberRepo(redisClient);
+        const transactionNumberRepo = new transactionNumber_1.TransactionNumberRepo({ redisClient, connection });
         yield DeliveryService.givePointAward(data)({
             action: actionRepo,
             assetTransaction: assetTransactionRepo,

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

@@ -25,7 +25,7 @@ function call(data) {
         }
         const actionRepo = new action_1.ActionRepo(connection);
         const productRepo = new product_1.ProductRepo(connection);
-        const transactionNumberRepo = new transactionNumber_1.TransactionNumberRepo(redisClient);
+        const transactionNumberRepo = new transactionNumber_1.TransactionNumberRepo({ redisClient, connection });
         yield MoneyTransferService.moneyTransfer(data)({
             action: actionRepo,
             product: productRepo,

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

@@ -43,14 +43,14 @@ function call(params) {
                 action: actionRepo,
                 assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
                 authorization: new authorization_1.AuthorizationRepo(connection),
-                orderNumber: new orderNumber_1.OrderNumberRepo(redisClient),
+                orderNumber: new orderNumber_1.OrderNumberRepo({ redisClient, connection }),
                 paymentAccepted: new sellerPaymentAccepted_1.SellerPaymentAcceptedRepo(connection),
                 paymentService: new paymentService_1.PaymentServiceRepo(connection),
                 paymentServiceProvider: new paymentServiceProvider_1.PaymentServiceProviderRepo(connection),
                 project: new project_1.ProjectRepo(connection),
                 ticket: new ticket_1.TicketRepo(connection),
                 transaction: new transaction_1.TransactionRepo(connection),
-                transactionNumber: new transactionNumber_1.TransactionNumberRepo(redisClient)
+                transactionNumber: new transactionNumber_1.TransactionNumberRepo({ redisClient, connection })
             }, settings);
         }
         catch (error) {

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

@@ -58,7 +58,7 @@ function call(params) {
             project: new project_1.ProjectRepo(connection),
             task: new task_1.TaskRepo(connection),
             assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
-            transactionNumber: new transactionNumber_1.TransactionNumberRepo(redisClient)
+            transactionNumber: new transactionNumber_1.TransactionNumberRepo({ redisClient, connection })
         }, settings);
     });
 }

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

@@ -29,7 +29,7 @@ function call(data) {
         const assetTransactionRepo = new assetTransaction_1.AssetTransactionRepo(connection);
         const productRepo = new product_1.ProductRepo(connection);
         const projectRepo = new project_1.ProjectRepo(connection);
-        const transactionNumberRepo = new transactionNumber_1.TransactionNumberRepo(redisClient);
+        const transactionNumberRepo = new transactionNumber_1.TransactionNumberRepo({ redisClient, connection });
         yield (0, returnMoneyTransfer_1.returnMoneyTransfer)(data)({
             action: actionRepo,
             assetTransaction: assetTransactionRepo,

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

@@ -39,7 +39,7 @@ function call(params) {
             product: new product_1.ProductRepo(connection),
             task: new task_1.TaskRepo(connection),
             transaction: new transaction_1.TransactionRepo(connection),
-            transactionNumber: new transactionNumber_1.TransactionNumberRepo(redisClient)
+            transactionNumber: new transactionNumber_1.TransactionNumberRepo({ redisClient, connection })
         });
     });
 }

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

@@ -29,7 +29,7 @@ function call(data) {
         const assetTransactionRepo = new assetTransaction_1.AssetTransactionRepo(connection);
         const productRepo = new product_1.ProductRepo(connection);
         const projectRepo = new project_1.ProjectRepo(connection);
-        const transactionNumberRepo = new transactionNumber_1.TransactionNumberRepo(redisClient);
+        const transactionNumberRepo = new transactionNumber_1.TransactionNumberRepo({ redisClient, connection });
         yield DeliveryService.returnPointAward(data)({
             action: actionRepo,
             assetTransaction: assetTransactionRepo,

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

@@ -55,7 +55,7 @@ function call(params) {
             assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
             project: new project_1.ProjectRepo(connection),
             reservation: new reservation_1.ReservationRepo(connection),
-            transactionNumber: new transactionNumber_1.TransactionNumberRepo(redisClient),
+            transactionNumber: new transactionNumber_1.TransactionNumberRepo({ redisClient, connection }),
             reserveService
         });
     });

package/package.json

@@ -113,5 +113,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.10.0-alpha.16"
+  "version": "22.10.0-alpha.17"
 }