@chevre/domain 21.2.0-alpha.0 → 21.2.0-alpha.10

package/example/src/chevre/aggregateEventReservation.ts

@@ -22,7 +22,7 @@ async function main() {
         id: String(process.env.EVENT_ID)
     })({
         event: new chevre.repository.Event(mongoose.connection),
-        eventAvailability: new chevre.repository.itemAvailability.ScreeningEvent(client),
+        stockHolder: new chevre.repository.StockHolder(client),
         offer: new chevre.repository.Offer(mongoose.connection),
         offerCatalog: new chevre.repository.OfferCatalog(mongoose.connection),
         offerRateLimit: new chevre.repository.rateLimit.Offer(client),

package/example/src/chevre/countDelayedTasks.ts

@@ -0,0 +1,17 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+export async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI);
+
+    const taskRepo = new chevre.repository.Task(mongoose.connection);
+
+    const count = await taskRepo.countDelayedTasks({ delayInSeconds: 60 });
+    console.log('count:', count);
+}
+
+main()
+    .then()
+    .catch(console.error);

package/example/src/chevre/countDelayedTransactions.ts

@@ -0,0 +1,60 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+export async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI);
+
+    const assetTransactionRepo = new chevre.repository.AssetTransaction(mongoose.connection);
+    const transactionRepo = new chevre.repository.Transaction(mongoose.connection);
+
+    for (const typeOf of [
+        chevre.factory.transactionType.PlaceOrder,
+        chevre.factory.transactionType.ReturnOrder,
+        chevre.factory.transactionType.MoneyTransfer
+    ]) {
+        const count = await transactionRepo.count({
+            typeOf,
+            statuses: [
+                chevre.factory.transactionStatusType.Canceled,
+                chevre.factory.transactionStatusType.Confirmed,
+                chevre.factory.transactionStatusType.Expired
+            ],
+            tasksExportationStatuses: [
+                chevre.factory.transactionTasksExportationStatus.Exporting,
+                chevre.factory.transactionTasksExportationStatus.Unexported
+            ],
+            endThrough: new Date()
+        });
+        console.log('count:', count, typeOf);
+    }
+
+    for (const typeOf of [
+        chevre.factory.assetTransactionType.CancelReservation,
+        chevre.factory.assetTransactionType.MoneyTransfer,
+        chevre.factory.assetTransactionType.Pay,
+        chevre.factory.assetTransactionType.Refund,
+        chevre.factory.assetTransactionType.RegisterService,
+        chevre.factory.assetTransactionType.Reserve
+    ]) {
+        const count = await assetTransactionRepo.count({
+            typeOf,
+            statuses: [
+                chevre.factory.transactionStatusType.Canceled,
+                chevre.factory.transactionStatusType.Confirmed,
+                chevre.factory.transactionStatusType.Expired
+            ],
+            tasksExportationStatuses: [
+                chevre.factory.transactionTasksExportationStatus.Exporting,
+                chevre.factory.transactionTasksExportationStatus.Unexported
+            ],
+            endThrough: new Date()
+        });
+        console.log('count:', count, typeOf);
+    }
+}
+
+main()
+    .then()
+    .catch(console.error);

package/example/src/chevre/countMoneyTransferTransaction.ts

@@ -0,0 +1,36 @@
+// tslint:disable:no-console
+import * as moment from 'moment';
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+const project = { id: String(process.env.PROJECT_ID) };
+
+// tslint:disable-next-line:max-func-body-length
+export async function main() {
+    const now = new Date();
+    await mongoose.connect(<string>process.env.MONGOLAB_URI);
+
+    const transactionRepo = new chevre.repository.Transaction(mongoose.connection);
+
+    const transactions = await transactionRepo.search<chevre.factory.transactionType.MoneyTransfer>(
+        {
+            project: { id: { $eq: project.id } },
+            typeOf: chevre.factory.transactionType.MoneyTransfer,
+            statuses: [chevre.factory.transactionStatusType.Confirmed],
+            startFrom: moment(now)
+                .add(-1, 'year')
+                .toDate(),
+            startThrough: now,
+            inclusion: ['_id', 'startDate', 'typeOf', 'object'],
+            exclusion: []
+        }
+    );
+    const count = transactions.filter((t) => t.object.description === '受け取り')
+        .length;
+    console.log('transactions found', count);
+}
+
+main()
+    .then()
+    .catch(console.error);

package/example/src/chevre/lockStockHolder.ts

@@ -0,0 +1,48 @@
+// tslint:disable:no-console
+import * as moment from 'moment';
+import * as redis from 'redis';
+
+import { chevre } from '../../../lib/index';
+
+// const project = { id: String(process.env.PROJECT_ID) };
+
+// tslint:disable-next-line:max-func-body-length
+async function main() {
+    const client = 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
+    });
+    await client.connect();
+
+    const startDate = moment('2023-04-18T00:00:00Z');
+
+    const stockHolderRepo = new chevre.repository.StockHolder(client);
+    await stockHolderRepo.lock({
+        eventId: 'sampleEventId',
+        startDate: startDate.toDate(),
+        offers: [
+            {
+                seatSection: 'sampleSeatSection',
+                seatNumber: 'sampleSeatNumber'
+            },
+            {
+                seatSection: 'sampleSeatSection1',
+                seatNumber: 'sampleSeatNumber1'
+            }
+        ],
+        expires: moment(startDate)
+            .add(1, 'month')
+            .toDate(),
+        holder: 'sampleStockHolder'
+    });
+    console.log('locked');
+}
+
+main()
+    .then(() => {
+        console.log('success!');
+    })
+    .catch(console.error);

package/example/src/chevre/migrateStockHolderKeys.ts

@@ -0,0 +1,89 @@
+// 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 EXCLUDED_PROJECT_ID = process.env.EXCLUDED_PROJECT_ID;
+
+async function main() {
+    const client = redis.createClient<redis.RedisDefaultModules, Record<string, never>, Record<string, never>>({
+        socket: {
+            host: process.env.REDIS_HOST,
+            port: Number(process.env.REDIS_PORT)
+        },
+        password: process.env.REDIS_KEY
+    });
+    await client.connect();
+    await mongoose.connect(<string>process.env.MONGOLAB_URI);
+
+    const eventRepo = new chevre.repository.Event(mongoose.connection);
+    const stockHolderRepo = new chevre.repository.StockHolder(client);
+
+    const cursor = eventRepo.getCursor(
+        {
+            // 'project.id': { $eq: project.id },
+            'project.id': { $ne: EXCLUDED_PROJECT_ID },
+            typeOf: { $eq: chevre.factory.eventType.ScreeningEvent },
+            startDate: {
+                $gte: moment('2023-04-23T15:00:00Z')
+                    .toDate()
+            }
+            // _id: { $eq: 'al6aff83w' }
+        },
+        {
+            // _id: 1,
+        }
+    );
+    console.log('events found');
+
+    let i = 0;
+    let updateCount = 0;
+    await cursor.eachAsync(async (doc) => {
+        i += 1;
+        const event: chevre.factory.event.screeningEvent.IEvent = doc.toObject();
+
+        const oldKey = chevre.repository.StockHolder.GET_KEY({
+            eventId: event.id,
+            startDate: new Date()
+        });
+        const newKey = chevre.repository.StockHolder.GET_KEY({
+            eventId: event.id,
+            startDate: moment(event.startDate)
+                .toDate()
+        });
+
+        let conflicted = false;
+        try {
+            await stockHolderRepo.checkIfConflicted({
+                key: newKey,
+                eventId: event.id
+            });
+        } catch (error) {
+            conflicted = true;
+        }
+
+        if (conflicted) {
+            updateCount += 1;
+            await stockHolderRepo.migrateKey({
+                key: newKey,
+                eventId: event.id
+            });
+            console.log(
+                'updated...', event.project.id, event.id, event.startDate, i);
+        } else {
+            console.log(
+                'already exist...', event.project.id, event.id, event.startDate, i);
+        }
+    });
+
+    console.log(i, 'events checked');
+    console.log(updateCount, 'events updated');
+}
+
+main()
+    .then()
+    .catch(console.error);

package/example/src/chevre/processReserve.ts

@@ -30,7 +30,7 @@ async function main() {
     const priceSpecRepo = new chevre.repository.PriceSpecification(mongoose.connection);
     const reservationRepo = new chevre.repository.Reservation(mongoose.connection);
     const eventRepo = new chevre.repository.Event(mongoose.connection);
-    const itemAvailabilityRepo = new chevre.repository.itemAvailability.ScreeningEvent(client);
+    const itemAvailabilityRepo = new chevre.repository.StockHolder(client);
     const offerRateLimitRepo = new chevre.repository.rateLimit.Offer(client);
 
     const identifier = `CIN${(new Date()).valueOf()}`;
@@ -70,7 +70,7 @@ async function main() {
         validateEventOfferPeriod: false,
         validateAppliesToMovieTicket: true
     })({
-        eventAvailability: itemAvailabilityRepo,
+        stockHolder: itemAvailabilityRepo,
         event: eventRepo,
         offer: offerRepo,
         offerCatalog: offerCatalogRepo,

package/example/src/chevre/searchEventSeats.ts

@@ -0,0 +1,42 @@
+// tslint:disable:no-console
+import * as redis from 'redis';
+
+import { chevre } from '../../../lib/index';
+
+// const project = { id: String(process.env.PROJECT_ID) };
+
+// tslint:disable-next-line:max-func-body-length
+async function main() {
+    const client = 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
+    });
+    await client.connect();
+
+    const itemAvailabilityRepo = new chevre.repository.StockHolder(client);
+
+    const result = await itemAvailabilityRepo.searchHolders({
+        eventId: 'alckc9mlx',
+        startDate: new Date(),
+        offers: [
+            {
+                seatSection: 'Default',
+                seatNumber: 'B-10'
+            },
+            {
+                seatSection: 'xxx',
+                seatNumber: 'xxx'
+            }
+        ]
+    });
+    console.log(result);
+}
+
+main()
+    .then(() => {
+        console.log('success!');
+    })
+    .catch(console.error);

package/lib/chevre/repo/account.js

@@ -10,7 +10,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MongoRepository = void 0;
-const onIndexCreated_1 = require("./mongoose/onIndexCreated");
 const account_1 = require("./mongoose/schemas/account");
 const factory = require("../factory");
 /**
@@ -19,9 +18,6 @@ const factory = require("../factory");
 class MongoRepository {
     constructor(connection) {
         this.accountModel = connection.model(account_1.modelName, account_1.schema);
-        if (connection.get('autoIndex') === true) {
-            this.accountModel.on(onIndexCreated_1.INDEX_EVENT, onIndexCreated_1.onIndexCreated);
-        }
     }
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     static CREATE_MONGO_CONDITIONS(params) {

package/lib/chevre/repo/accountTitle.js

@@ -11,7 +11,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MongoRepository = void 0;
 const factory = require("../factory");
-const onIndexCreated_1 = require("./mongoose/onIndexCreated");
 const accountTitle_1 = require("./mongoose/schemas/accountTitle");
 /**
  * 科目リポジトリ
@@ -19,9 +18,6 @@ const accountTitle_1 = require("./mongoose/schemas/accountTitle");
 class MongoRepository {
     constructor(connection) {
         this.accountTitleModel = connection.model(accountTitle_1.modelName, accountTitle_1.schema);
-        if (connection.get('autoIndex') === true) {
-            this.accountTitleModel.on(onIndexCreated_1.INDEX_EVENT, onIndexCreated_1.onIndexCreated);
-        }
     }
     deleteByProject(params) {
         return __awaiter(this, void 0, void 0, function* () {

package/lib/chevre/repo/accountTransaction.js

@@ -11,7 +11,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MongoRepository = void 0;
 const moment = require("moment");
-const onIndexCreated_1 = require("./mongoose/onIndexCreated");
 const accountTransaction_1 = require("./mongoose/schemas/accountTransaction");
 const factory = require("../factory");
 /**
@@ -20,9 +19,6 @@ const factory = require("../factory");
 class MongoRepository {
     constructor(connection) {
         this.transactionModel = connection.model(accountTransaction_1.modelName, accountTransaction_1.schema);
-        if (connection.get('autoIndex') === true) {
-            this.transactionModel.on(onIndexCreated_1.INDEX_EVENT, onIndexCreated_1.onIndexCreated);
-        }
     }
     static CREATE_MONGO_CONDITIONS(params) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;

package/lib/chevre/repo/accountingReport.js

@@ -10,7 +10,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MongoRepository = void 0;
-const onIndexCreated_1 = require("./mongoose/onIndexCreated");
 const accountingReport_1 = require("./mongoose/schemas/accountingReport");
 const errorHandler_1 = require("../errorHandler");
 /**
@@ -19,9 +18,6 @@ const errorHandler_1 = require("../errorHandler");
 class MongoRepository {
     constructor(connection) {
         this.accountingReportModel = connection.model(accountingReport_1.modelName, accountingReport_1.schema);
-        if (connection.get('autoIndex') === true) {
-            this.accountingReportModel.on(onIndexCreated_1.INDEX_EVENT, onIndexCreated_1.onIndexCreated);
-        }
     }
     /**
      * なければ作成する

package/lib/chevre/repo/action.js

@@ -11,7 +11,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MongoRepository = void 0;
 const factory = require("../factory");
-const onIndexCreated_1 = require("./mongoose/onIndexCreated");
 const action_1 = require("./mongoose/schemas/action");
 /**
  * アクションリポジトリ
@@ -19,9 +18,6 @@ const action_1 = require("./mongoose/schemas/action");
 class MongoRepository {
     constructor(connection) {
         this.actionModel = connection.model(action_1.modelName, action_1.schema);
-        if (connection.get('autoIndex') === true) {
-            this.actionModel.on(onIndexCreated_1.INDEX_EVENT, onIndexCreated_1.onIndexCreated);
-        }
     }
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     static CREATE_MONGO_CONDITIONS(params) {

package/lib/chevre/repo/additionalProperty.js

@@ -21,7 +21,6 @@ var __rest = (this && this.__rest) || function (s, e) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MongoRepository = void 0;
-const onIndexCreated_1 = require("./mongoose/onIndexCreated");
 const additionalProperty_1 = require("./mongoose/schemas/additionalProperty");
 const factory = require("../factory");
 /**
@@ -30,9 +29,6 @@ const factory = require("../factory");
 class MongoRepository {
     constructor(connection) {
         this.additionalPropertyModel = connection.model(additionalProperty_1.modelName, additionalProperty_1.schema);
-        if (connection.get('autoIndex') === true) {
-            this.additionalPropertyModel.on(onIndexCreated_1.INDEX_EVENT, onIndexCreated_1.onIndexCreated);
-        }
     }
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     static CREATE_MONGO_CONDITIONS(params) {

package/lib/chevre/repo/aggregation.js

@@ -21,7 +21,6 @@ var __rest = (this && this.__rest) || function (s, e) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MongoRepository = exports.AggregationType = void 0;
-const onIndexCreated_1 = require("./mongoose/onIndexCreated");
 const aggregation_1 = require("./mongoose/schemas/aggregation");
 var AggregationType;
 (function (AggregationType) {
@@ -43,9 +42,6 @@ var AggregationType;
 class MongoRepository {
     constructor(connection) {
         this.aggregationModel = connection.model(aggregation_1.modelName, aggregation_1.schema);
-        if (connection.get('autoIndex') === true) {
-            this.aggregationModel.on(onIndexCreated_1.INDEX_EVENT, onIndexCreated_1.onIndexCreated);
-        }
     }
     saveAggregation(params) {
         return __awaiter(this, void 0, void 0, function* () {

package/lib/chevre/repo/assetTransaction.js

@@ -11,7 +11,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MongoRepository = void 0;
 const moment = require("moment");
-const onIndexCreated_1 = require("./mongoose/onIndexCreated");
 const assetTransaction_1 = require("./mongoose/schemas/assetTransaction");
 const factory = require("../factory");
 /**
@@ -20,9 +19,6 @@ const factory = require("../factory");
 class MongoRepository {
     constructor(connection) {
         this.transactionModel = connection.model(assetTransaction_1.modelName, assetTransaction_1.schema);
-        if (connection.get('autoIndex') === true) {
-            this.transactionModel.on(onIndexCreated_1.INDEX_EVENT, onIndexCreated_1.onIndexCreated);
-        }
     }
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     static CREATE_MONGO_CONDITIONS(params) {
@@ -106,6 +102,11 @@ class MongoRepository {
                 }
             });
         }
+        if (Array.isArray(params.tasksExportationStatuses)) {
+            andConditions.push({
+                tasksExportationStatus: { $in: params.tasksExportationStatuses }
+            });
+        }
         switch (params.typeOf) {
             case factory.assetTransactionType.Pay:
                 const objectAccountIdEq = (_e = (_d = params.object) === null || _d === void 0 ? void 0 : _d.accountId) === null || _e === void 0 ? void 0 : _e.$eq;

package/lib/chevre/repo/categoryCode.js

@@ -21,7 +21,6 @@ var __rest = (this && this.__rest) || function (s, e) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MongoRepository = void 0;
-const onIndexCreated_1 = require("./mongoose/onIndexCreated");
 const categoryCode_1 = require("./mongoose/schemas/categoryCode");
 const factory = require("../factory");
 /**
@@ -30,9 +29,6 @@ const factory = require("../factory");
 class MongoRepository {
     constructor(connection) {
         this.categoryCodeModel = connection.model(categoryCode_1.modelName, categoryCode_1.schema);
-        if (connection.get('autoIndex') === true) {
-            this.categoryCodeModel.on(onIndexCreated_1.INDEX_EVENT, onIndexCreated_1.onIndexCreated);
-        }
     }
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     static CREATE_MONGO_CONDITIONS(params) {

package/lib/chevre/repo/code.js

@@ -13,7 +13,6 @@ exports.MongoRepository = exports.modelName = void 0;
 const moment = require("moment");
 const uuid = require("uuid");
 const factory = require("../factory");
-const onIndexCreated_1 = require("./mongoose/onIndexCreated");
 const authorization_1 = require("./mongoose/schemas/authorization");
 Object.defineProperty(exports, "modelName", { enumerable: true, get: function () { return authorization_1.modelName; } });
 /**
@@ -22,9 +21,6 @@ Object.defineProperty(exports, "modelName", { enumerable: true, get: function ()
 class MongoRepository {
     constructor(connection) {
         this.authorizationModel = connection.model(authorization_1.modelName, authorization_1.schema);
-        if (connection.get('autoIndex') === true) {
-            this.authorizationModel.on(onIndexCreated_1.INDEX_EVENT, onIndexCreated_1.onIndexCreated);
-        }
     }
     // tslint:disable-next-line:max-func-body-length
     static CREATE_MONGO_CONDITIONS(params) {

package/lib/chevre/repo/comment.js

@@ -10,7 +10,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MongoRepository = void 0;
-const onIndexCreated_1 = require("./mongoose/onIndexCreated");
 const comments_1 = require("./mongoose/schemas/comments");
 const factory = require("../factory");
 /**
@@ -19,9 +18,6 @@ const factory = require("../factory");
 class MongoRepository {
     constructor(connection) {
         this.commentModel = connection.model(comments_1.modelName, comments_1.schema);
-        if (connection.get('autoIndex') === true) {
-            this.commentModel.on(onIndexCreated_1.INDEX_EVENT, onIndexCreated_1.onIndexCreated);
-        }
     }
     static CREATE_MONGO_CONDITIONS(params) {
         var _a, _b, _c, _d, _e, _f;

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

@@ -3,10 +3,12 @@ import { RedisClientType } from 'redis';
  * 確認番号リポジトリ
  */
 export declare class RedisRepository {
+    private static readonly REDIS_KEY_PREFIX_NEW;
     private static readonly REDIS_KEY_PREFIX;
     private readonly redisClient;
     constructor(redisClient: RedisClientType);
-    static ALIGN_DIGITS(params: string): string;
+    private static alignDigits;
+    private static createKey;
     /**
      * 発行する
      */

package/lib/chevre/repo/confirmationNumber.js

@@ -16,6 +16,7 @@ const util = require("util");
 // tslint:disable-next-line:no-require-imports no-var-requires
 const fpe = require('node-fpe');
 const factory = require("../factory");
+const settings_1 = require("../settings");
 const CONFIRMATION_NUMBER_MIN_LENGH = 4;
 /**
  * 確認番号リポジトリ
@@ -24,7 +25,7 @@ class RedisRepository {
     constructor(redisClient) {
         this.redisClient = redisClient;
     }
-    static ALIGN_DIGITS(params) {
+    static alignDigits(params) {
         let aligndNumber = String(params);
         if (aligndNumber.length < CONFIRMATION_NUMBER_MIN_LENGH) {
             aligndNumber = `${'0'.repeat(CONFIRMATION_NUMBER_MIN_LENGH)}${aligndNumber}`
@@ -32,6 +33,21 @@ class RedisRepository {
         }
         return aligndNumber;
     }
+    static createKey(params) {
+        const useNewKey = params.orderDate instanceof Date
+            && moment(params.orderDate)
+                .isSameOrAfter(settings_1.USE_NEW_CONFIRMATION_NUMBER_KEY_FROM);
+        if (useNewKey) {
+            return util.format('%s:%s', RedisRepository.REDIS_KEY_PREFIX_NEW, moment(params.orderDate)
+                .tz('Asia/Tokyo')
+                .format('YYMM'));
+        }
+        else {
+            return util.format('%s:%s', RedisRepository.REDIS_KEY_PREFIX, moment(params.orderDate)
+                .tz('Asia/Tokyo')
+                .format('YYMM'));
+        }
+    }
     /**
      * 発行する
      */
@@ -41,44 +57,29 @@ class RedisRepository {
             const TTL = moment(params.orderDate)
                 .add(1, 'month')
                 .diff(moment(params.orderDate), 'seconds');
-            const key = util.format('%s:%s', RedisRepository.REDIS_KEY_PREFIX, moment(params.orderDate)
-                .tz('Asia/Tokyo')
-                .format('YYMM'));
+            const key = RedisRepository.createKey({ orderDate: params.orderDate });
             const [incrReply] = yield this.redisClient.multi()
                 .incr(key)
                 .expire(key, TTL)
                 .exec();
-            // if (!Array.isArray(results)) {
-            //     // なぜかresults: nullのことがあるのでハンドリング
-            //     throw new factory.errors.ServiceUnavailable('incr confirmationNumber result not array');
-            // }
             // tslint:disable-next-line:no-single-line-block-comment
-            /* istanbul ignore else: please write tests */
-            if (typeof incrReply === 'number') {
-                const no = incrReply;
-                // debug('no incremented.', no);
-                // 桁数調整
-                let confirmationNumber = RedisRepository.ALIGN_DIGITS(String(no));
-                // debug('encrypting confirmationNumber...', confirmationNumber);
-                // checkdigit
-                const cd = cdigit.luhn.compute(confirmationNumber);
-                // debug('check digit:', cd);
-                confirmationNumber = fpe({ password: cd })
-                    .encrypt(confirmationNumber);
-                confirmationNumber = `${cd}${confirmationNumber}`;
-                // console.log(
-                //     'decrypted confirmationNumber:',
-                //     fpe({ password: confirmationNumber.slice(0, 1) })
-                //         .decrypt(confirmationNumber.slice(1))
-                // );
-                return confirmationNumber;
-            }
-            else {
+            /* istanbul ignore if */
+            if (typeof incrReply !== 'number') {
                 // 基本的にありえないフロー
-                throw new factory.errors.ServiceUnavailable('Confirmation number not published');
+                throw new factory.errors.ServiceUnavailable('confirmation number not incremented unexpectedly');
             }
+            // 桁数調整
+            let confirmationNumber = RedisRepository.alignDigits(incrReply);
+            // checkdigit
+            const cd = cdigit.luhn.compute(confirmationNumber);
+            // debug('check digit:', cd);
+            confirmationNumber = fpe({ password: cd })
+                .encrypt(confirmationNumber);
+            confirmationNumber = `${cd}${confirmationNumber}`;
+            return confirmationNumber;
         });
     }
 }
+RedisRepository.REDIS_KEY_PREFIX_NEW = 'confirmationNumber';
 RedisRepository.REDIS_KEY_PREFIX = 'cinerino:confirmationNumber';
 exports.RedisRepository = RedisRepository;