@chevre/domain 22.11.0-alpha.3 → 22.11.0-alpha.5

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

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

package/example/src/chevre/roles/addAdminInventoryManagerRole.ts

@@ -0,0 +1,50 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../../lib/index';
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const roleRepo = await chevre.repository.Role.createInstance(mongoose.connection);
+
+    const roleNames = [
+        chevre.factory.role.organizationRole.RoleName.AdminInventoryManager
+    ];
+    const permissions = [
+        'iam.members.me.read',
+        'admin.creativeWorks.*',
+        'admin.sellers.eventSeries.*',
+        'admin.sellers.read'
+    ];
+    for (const roleName of roleNames) {
+        const existingRoles = await roleRepo.projectFields(
+            {
+                roleName: { $eq: roleName }
+            },
+            ['roleName']
+        );
+        if (existingRoles.length === 0) {
+            const createResult = await roleRepo.create({
+                roleName: roleName,
+                member: { typeOf: chevre.factory.creativeWorkType.SoftwareApplication },
+                memberOf: { typeOf: chevre.factory.organizationType.Project },
+                permissions: []
+            });
+            console.log('role created.', createResult);
+        }
+        for (const permission of permissions) {
+            const result = await roleRepo.addPermissionIfNotExists({
+                roleName: { $eq: roleName },
+                permission
+            });
+            console.log('permission added.', result, roleName);
+        }
+    }
+}
+
+main()
+    .then(() => {
+        console.log('success!');
+    })
+    .catch(console.error);

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

@@ -1,14 +1,10 @@
 import type { Connection } from 'mongoose';
-import { RedisClientType } from 'redis';
-import { ISetting } from './mongoose/schemas/setting';
 /**
  * 確認番号リポジトリ
  */
 export declare class ConfirmationNumberRepo {
-    private readonly settingModel;
     private readonly counterRepo;
     constructor(params: {
-        redisClient: RedisClientType;
         connection: Connection;
     });
     private static alignDigits;
@@ -20,11 +16,4 @@ export declare class ConfirmationNumberRepo {
     publish(params: {
         orderDate: Date;
     }): Promise<string>;
-    /**
-     * DB移行時のみに使用目的の設定更新
-     */
-    setUseMongo4confirmationNumberFrom(params: {
-        useMongo4confirmationNumberFrom: Date;
-    }): Promise<Pick<ISetting, "useMongo4confirmationNumberFrom"> | null>;
-    private useMongoBySettings;
 }

package/lib/chevre/repo/confirmationNumber.js

@@ -12,9 +12,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConfirmationNumberRepo = 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");
 const CONFIRMATION_NUMBER_MIN_LENGH = 4;
@@ -24,8 +25,8 @@ const TIMEZONE = 'Asia/Tokyo';
  */
 class ConfirmationNumberRepo {
     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);
     }
     static alignDigits(params) {
@@ -72,59 +73,19 @@ class ConfirmationNumberRepo {
             const dataFeedIdentifier = ConfirmationNumberRepo.createDataFeedIdentifier({ orderDate: params.orderDate });
             let incrReply;
             // support publishByMongo(2025-05-23~)
-            const useMongoBySettings = yield this.useMongoBySettings(params);
-            if (useMongoBySettings) {
-                // データ保管期間はとりあえず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
-                });
-            }
-            else {
-                // データ保管期間はとりあえず一か月
-                dataFeedExpires = moment(params.orderDate)
-                    .add(1, 'month')
-                    .toDate();
-                incrReply = yield this.counterRepo.incrementByRedis({
-                    identifier: dataFeedIdentifier,
-                    includedInDataCatalog: { identifier: transactionNumber_1.DataCatalogIdentifier.confirmationNumber },
-                    expires: dataFeedExpires
-                });
-            }
+            // const useMongoBySettings = await this.useMongoBySettings(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
+            });
             return ConfirmationNumberRepo.count2confirmationNumber({ count: incrReply });
         });
     }
-    /**
-     * DB移行時のみに使用目的の設定更新
-     */
-    setUseMongo4confirmationNumberFrom(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { useMongo4confirmationNumberFrom } = params;
-            return this.settingModel.findOneAndUpdate({ 'project.id': { $eq: '*' } }, {
-                $set: { useMongo4confirmationNumberFrom }
-            }, { projection: { _id: 0, useMongo4confirmationNumberFrom: 1 } })
-                .lean()
-                .exec();
-        });
-    }
-    useMongoBySettings(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const setting = yield this.settingModel.findOne({ 'project.id': { $eq: '*' } }, {
-                _id: 0,
-                useMongo4confirmationNumberFrom: 1
-            })
-                .lean()
-                .exec();
-            const useMongo4confirmationNumberFrom = setting === null || setting === void 0 ? void 0 : setting.useMongo4confirmationNumberFrom;
-            return useMongo4confirmationNumberFrom instanceof Date
-                && moment(params.orderDate)
-                    .isSameOrAfter(moment(useMongo4confirmationNumberFrom));
-        });
-    }
 }
 exports.ConfirmationNumberRepo = ConfirmationNumberRepo;

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

@@ -1,14 +1,10 @@
 import type { Connection } from 'mongoose';
-import { RedisClientType } from 'redis';
-import { ISetting } from './mongoose/schemas/setting';
 /**
  * 注文番号リポジトリ
  */
 export declare class OrderNumberRepo {
-    private readonly settingModel;
     private readonly counterRepo;
     constructor(params: {
-        redisClient: RedisClientType;
         connection: Connection;
     });
     /**
@@ -23,11 +19,4 @@ export declare class OrderNumberRepo {
          */
         orderDate: Date;
     }): Promise<string>;
-    /**
-     * DB移行時のみに使用目的の設定更新
-     */
-    setUseMongo4orderNumberFrom(params: {
-        useMongo4orderNumberFrom: Date;
-    }): Promise<Pick<ISetting, "useMongo4orderNumberFrom"> | null>;
-    private useMongoBySettings;
 }

package/lib/chevre/repo/orderNumber.js

@@ -12,9 +12,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.OrderNumberRepo = 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");
 const ORDER_NUMBER_SEPARATOR = '-';
@@ -23,8 +24,8 @@ const ORDER_NUMBER_SEPARATOR = '-';
  */
 class OrderNumberRepo {
     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: {
@@ -52,27 +53,15 @@ class OrderNumberRepo {
             let dataFeedExpires;
             const dataFeedIdentifier = `${projectPrefix}:${timestamp}`;
             let incrReply;
-            const useMongoBySettings = yield this.useMongoBySettings(params);
-            if (useMongoBySettings) {
-                dataFeedExpires = moment(params.orderDate)
-                    .add(1, 'minute') // ミリ秒でカウントしていくので、注文日時後1分で十分
-                    .toDate();
-                incrReply = yield this.counterRepo.incrementByMongo({
-                    identifier: dataFeedIdentifier,
-                    includedInDataCatalog: { identifier: transactionNumber_1.DataCatalogIdentifier.orderNumber },
-                    expires: dataFeedExpires
-                });
-            }
-            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
-                });
-            }
+            // const useMongoBySettings = await this.useMongoBySettings(params);
+            dataFeedExpires = moment(params.orderDate)
+                .add(1, 'minute') // ミリ秒でカウントしていくので、注文日時後1分で十分
+                .toDate();
+            incrReply = yield this.counterRepo.incrementByMongo({
+                identifier: dataFeedIdentifier,
+                includedInDataCatalog: { identifier: transactionNumber_1.DataCatalogIdentifier.orderNumber },
+                expires: dataFeedExpires
+            });
             let orderNumber = `${timestamp}${incrReply}`;
             // checkdigit
             const cd = cdigit.luhn.compute(orderNumber);
@@ -90,32 +79,5 @@ class OrderNumberRepo {
             return orderNumber;
         });
     }
-    /**
-     * DB移行時のみに使用目的の設定更新
-     */
-    setUseMongo4orderNumberFrom(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { useMongo4orderNumberFrom } = params;
-            return this.settingModel.findOneAndUpdate({ 'project.id': { $eq: '*' } }, {
-                $set: { useMongo4orderNumberFrom }
-            }, { projection: { _id: 0, useMongo4orderNumberFrom: 1 } })
-                .lean()
-                .exec();
-        });
-    }
-    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;

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

@@ -29,5 +29,8 @@ export declare class RoleRepo {
     addMember(params: Pick<IRole, 'member' | 'memberOf' | 'roleName'>): Promise<(import("mongoose").FlattenMaps<IDocType> & {
         _id: import("mongoose").Types.ObjectId;
     }) | null>;
+    create(params: Pick<IRole, 'member' | 'memberOf' | 'permissions' | 'roleName'>): Promise<{
+        id: string;
+    }>;
 }
 export {};

package/lib/chevre/repo/role.js

@@ -10,6 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RoleRepo = void 0;
+const factory = require("../factory");
 const settings_1 = require("../settings");
 const role_1 = require("./mongoose/schemas/role");
 const AVAILABLE_PROJECT_FIELDS = [
@@ -148,5 +149,23 @@ class RoleRepo {
                 .exec();
         });
     }
+    create(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b;
+            let savedId;
+            const { member, memberOf, permissions, roleName } = params;
+            const creatingRole = {
+                member, memberOf, permissions, roleName,
+                typeOf: factory.role.RoleType.OrganizationRole
+            };
+            const result = yield this.roleModel.insertMany(creatingRole, { rawResult: true });
+            const insertedId = (_b = (_a = result.insertedIds) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.toHexString();
+            if (typeof insertedId !== 'string') {
+                throw new factory.errors.Internal(`role not saved unexpectedly. result:${JSON.stringify(result)}`);
+            }
+            savedId = insertedId;
+            return { id: savedId };
+        });
+    }
 }
 exports.RoleRepo = RoleRepo;

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

@@ -1,13 +1,10 @@
 import type { Connection } from 'mongoose';
-import { RedisClientType } from 'redis';
 /**
  * サービスアウトプット識別子リポジトリ
  */
 export declare class ServiceOutputIdentifierRepo {
-    private readonly settingModel;
     private readonly counterRepo;
     constructor(params: {
-        redisClient: RedisClientType;
         connection: Connection;
     });
     /**
@@ -16,5 +13,4 @@ export declare class ServiceOutputIdentifierRepo {
     publishByTimestamp(params: {
         startDate: Date;
     }): Promise<string>;
-    private useMongoBySettings;
 }

package/lib/chevre/repo/serviceOutputIdentifier.js

@@ -12,9 +12,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ServiceOutputIdentifierRepo = 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 ServiceOutputIdentifierRepo {
     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 ServiceOutputIdentifierRepo {
             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.serviceOutputIdentifier },
-                    expires: dataFeedExpires
-                });
-            }
-            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
-                });
-            }
+            // 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.serviceOutputIdentifier },
+                expires: dataFeedExpires
+            });
             let identifier = `${timestamp}${incrReply}`;
             // checkdigit
             const cd = cdigit.luhn.compute(identifier);
@@ -77,19 +66,5 @@ 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;

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/task/acceptCOAOffer.js

@@ -86,7 +86,7 @@ function call(params) {
                 })({
                     action: actionRepo,
                     event: new event_1.EventRepo(connection),
-                    orderNumber: new orderNumber_1.OrderNumberRepo({ redisClient, connection }),
+                    orderNumber: new orderNumber_1.OrderNumberRepo({ 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, connection }),
+                    orderNumber: new orderNumber_1.OrderNumberRepo({ 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({ 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, connection }),
+                orderNumber: new orderNumber_1.OrderNumberRepo({ 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, connection })
+                transactionNumber: new transactionNumber_1.TransactionNumberRepo({ 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, connection });
+        const transactionNumberRepo = new transactionNumber_1.TransactionNumberRepo({ 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, connection });
+        const transactionNumberRepo = new transactionNumber_1.TransactionNumberRepo({ 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, connection }),
+                orderNumber: new orderNumber_1.OrderNumberRepo({ 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, connection })
+                transactionNumber: new transactionNumber_1.TransactionNumberRepo({ 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, connection })
+            transactionNumber: new transactionNumber_1.TransactionNumberRepo({ 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, connection });
+        const transactionNumberRepo = new transactionNumber_1.TransactionNumberRepo({ 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, connection })
+            transactionNumber: new transactionNumber_1.TransactionNumberRepo({ 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, connection });
+        const transactionNumberRepo = new transactionNumber_1.TransactionNumberRepo({ 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, connection }),
+            transactionNumber: new transactionNumber_1.TransactionNumberRepo({ connection }),
             reserveService
         });
     });

package/package.json

@@ -11,8 +11,8 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.600.0",
     "@aws-sdk/credential-providers": "3.600.0",
-    "@chevre/factory": "4.395.0-alpha.2",
-    "@cinerino/sdk": "11.0.0-alpha.3",
+    "@chevre/factory": "4.395.0-alpha.3",
+    "@cinerino/sdk": "11.0.0-alpha.4",
     "@motionpicture/coa-service": "9.6.0",
     "@motionpicture/gmo-service": "5.3.0",
     "@sendgrid/client": "8.1.4",
@@ -113,5 +113,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.11.0-alpha.3"
+  "version": "22.11.0-alpha.5"
 }

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

@@ -1,37 +0,0 @@
-// 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 confirmationNumberRepo = await chevre.repository.ConfirmationNumber.createInstance({
-        redisClient,
-        connection: mongoose.connection
-    });
-    const result = await confirmationNumberRepo.publish({ orderDate: new Date() });
-    console.log(result);
-}
-
-main()
-    .then(() => {
-        console.log('success!');
-    })
-    .catch(console.error);

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

@@ -1,40 +0,0 @@
-// 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/transactionNumber/setUseMongo4confirmationNumberFrom.ts

@@ -1,45 +0,0 @@
-// tslint:disable:no-console
-import * as moment from 'moment';
-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 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')
-            .toDate()
-    });
-    console.log(result);
-}
-
-main()
-    .then(() => {
-        console.log('success!');
-    })
-    .catch(console.error);

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

@@ -1,41 +0,0 @@
-// tslint:disable:no-console
-import * as moment from 'moment';
-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.setUseMongo4orderNumberFrom({
-        useMongo4orderNumberFrom: moment('2025-06-03T05:00:00Z')
-            .toDate()
-    });
-    console.log(result);
-}
-
-main()
-    .then(() => {
-        console.log('success!');
-    })
-    .catch(console.error);

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

@@ -1,41 +0,0 @@
-// tslint:disable:no-console
-import * as moment from 'moment';
-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 transactionNumberRepo = await chevre.repository.TransactionNumber.createInstance({
-        redisClient,
-        connection: mongoose.connection
-    });
-    const result = await transactionNumberRepo.setUseMongo4transactionNumberFrom({
-        useMongo4transactionNumberFrom: moment('2025-06-05T22:45:00Z')
-            .toDate()
-    });
-    console.log(result);
-}
-
-main()
-    .then(() => {
-        console.log('success!');
-    })
-    .catch(console.error);