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

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_ORDER_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;

package/lib/chevre/repo/itemAvailability/screeningEvent.d.ts

@@ -25,18 +25,15 @@ export interface IUnlockKey {
     offer: IOffer;
 }
 /**
- * イベントの座席在庫リポジトリ
+ * イベントストックホルダーリポジトリ
  */
 export declare class RedisRepository {
     static KEY_PREFIX_NEW: string;
     static KEY_PREFIX: string;
     private readonly redisClient;
     constructor(redisClient: RedisClientType);
-    static OFFER2FIELD(params: IOffer): string;
-    static CREATE_KEY(params: {
-        eventId: string;
-        startDate: Date;
-    }): string;
+    private static offer2field;
+    private static createKey;
     /**
      * 座席をロックする(maxキャパシティチェック有)
      */

package/lib/chevre/repo/itemAvailability/screeningEvent.js

@@ -16,13 +16,13 @@ const factory = require("../../factory");
 const settings_1 = require("../../settings");
 const debug = createDebug('chevre-domain:repo');
 /**
- * イベントの座席在庫リポジトリ
+ * イベントストックホルダーリポジトリ
  */
 class RedisRepository {
     constructor(redisClient) {
         this.redisClient = redisClient;
     }
-    static OFFER2FIELD(params) {
+    static offer2field(params) {
         var _a, _b;
         // 予約IDをfieldにする場合
         const serviceOutputId = (_b = (_a = params.itemOffered) === null || _a === void 0 ? void 0 : _a.serviceOutput) === null || _b === void 0 ? void 0 : _b.id;
@@ -31,10 +31,10 @@ class RedisRepository {
         }
         return `${params.seatSection}:${params.seatNumber}`;
     }
-    static CREATE_KEY(params) {
+    static createKey(params) {
         const useNewKey = params.startDate instanceof Date
             && moment(params.startDate)
-                .isAfter(settings_1.USE_NEW_EVENT_AVAILABILITY_KEY_FROM);
+                .isSameOrAfter(settings_1.USE_NEW_EVENT_AVAILABILITY_KEY_FROM);
         if (useNewKey) {
             return `${RedisRepository.KEY_PREFIX_NEW}:${params.eventId}`;
         }
@@ -47,7 +47,7 @@ class RedisRepository {
      */
     lockIfNotLimitExceeded(lockKey, maximum) {
         return __awaiter(this, void 0, void 0, function* () {
-            const key = RedisRepository.CREATE_KEY({ eventId: lockKey.eventId, startDate: lockKey.startDate });
+            const key = RedisRepository.createKey({ eventId: lockKey.eventId, startDate: lockKey.startDate });
             yield this.redisClient.watch(key);
             const hashCount = yield this.redisClient.hLen(key);
             // Process result
@@ -64,10 +64,10 @@ class RedisRepository {
      */
     lock(lockKey) {
         return __awaiter(this, void 0, void 0, function* () {
-            const key = RedisRepository.CREATE_KEY({ eventId: lockKey.eventId, startDate: lockKey.startDate });
+            const key = RedisRepository.createKey({ eventId: lockKey.eventId, startDate: lockKey.startDate });
             const value = lockKey.holder;
             const multi = this.redisClient.multi();
-            const fields = lockKey.offers.map((offer) => RedisRepository.OFFER2FIELD(offer));
+            const fields = lockKey.offers.map((offer) => RedisRepository.offer2field(offer));
             fields.forEach((field) => {
                 multi.hSetNX(key, field, value);
             });
@@ -103,8 +103,8 @@ class RedisRepository {
      */
     unlock(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const key = RedisRepository.CREATE_KEY({ eventId: params.eventId, startDate: params.startDate });
-            const field = RedisRepository.OFFER2FIELD(params.offer);
+            const key = RedisRepository.createKey({ eventId: params.eventId, startDate: params.startDate });
+            const field = RedisRepository.offer2field(params.offer);
             yield this.redisClient.multi()
                 .hDel(key, field)
                 .exec();
@@ -115,7 +115,7 @@ class RedisRepository {
      */
     findUnavailableOffersByEventId(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const key = RedisRepository.CREATE_KEY({ eventId: params.eventId, startDate: params.startDate });
+            const key = RedisRepository.createKey({ eventId: params.eventId, startDate: params.startDate });
             const reply = yield this.redisClient.hGetAll(key);
             let offers = [];
             if (reply !== null) {
@@ -134,7 +134,7 @@ class RedisRepository {
      */
     countUnavailableOffers(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const key = RedisRepository.CREATE_KEY({ eventId: params.event.id, startDate: params.event.startDate });
+            const key = RedisRepository.createKey({ eventId: params.event.id, startDate: params.event.startDate });
             const reply = yield this.redisClient.hLen(key);
             let fieldCount = 0;
             if (typeof reply === 'number') {
@@ -148,8 +148,8 @@ class RedisRepository {
      */
     getHolder(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const key = RedisRepository.CREATE_KEY({ eventId: params.eventId, startDate: params.startDate });
-            const field = RedisRepository.OFFER2FIELD(params.offer);
+            const key = RedisRepository.createKey({ eventId: params.eventId, startDate: params.startDate });
+            const field = RedisRepository.offer2field(params.offer);
             return this.redisClient.hGet(key, field);
         });
     }
@@ -159,9 +159,9 @@ class RedisRepository {
      */
     searchAvailability(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const key = RedisRepository.CREATE_KEY({ eventId: params.eventId, startDate: params.startDate });
+            const key = RedisRepository.createKey({ eventId: params.eventId, startDate: params.startDate });
             const fields = params.offers.map((o) => {
-                return RedisRepository.OFFER2FIELD(o);
+                return RedisRepository.offer2field(o);
             });
             const result = yield this.redisClient.hmGet(key, fields);
             if (!Array.isArray(result)) {

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

@@ -3,9 +3,11 @@ import { RedisClientType } from 'redis';
  * 注文番号リポジトリ
  */
 export declare class RedisRepository {
-    static REDIS_KEY_PREFIX: string;
+    private static readonly REDIS_KEY_PREFIX_NEW;
+    private static readonly REDIS_KEY_PREFIX;
     private readonly redisClient;
     constructor(redisClient: RedisClientType);
+    private static createKey;
     /**
      * タイムスタンプから発行する
      */

package/lib/chevre/repo/orderNumber.js

@@ -16,6 +16,8 @@ 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 ORDER_NUMBER_SEPARATOR = '-';
 /**
  * 注文番号リポジトリ
  */
@@ -23,6 +25,17 @@ class RedisRepository {
     constructor(redisClient) {
         this.redisClient = redisClient;
     }
+    static createKey(params) {
+        const useNewKey = params.orderDate instanceof Date
+            && moment(params.orderDate)
+                .isSameOrAfter(settings_1.USE_NEW_ORDER_NUMBER_KEY_FROM);
+        if (useNewKey) {
+            return util.format('%s:%s:%s', RedisRepository.REDIS_KEY_PREFIX_NEW, params.projectPrefix, params.timestamp);
+        }
+        else {
+            return util.format('%s:%s:%s', RedisRepository.REDIS_KEY_PREFIX, params.projectPrefix, params.timestamp);
+        }
+    }
     /**
      * タイムスタンプから発行する
      */
@@ -37,42 +50,35 @@ class RedisRepository {
             const TTL = moment(params.orderDate)
                 .add(1, 'minute') // ミリ秒でカウントしていくので、注文日時後1分で十分
                 .diff(now, 'seconds');
-            const key = util.format('%s:%s:%s', RedisRepository.REDIS_KEY_PREFIX, projectPrefix, timestamp);
+            const key = RedisRepository.createKey({ orderDate: params.orderDate, projectPrefix, timestamp });
             const [incrReply] = yield this.redisClient.multi()
                 .incr(key)
                 .expire(key, TTL)
                 .exec();
-            // if (!Array.isArray(results)) {
-            //     // なぜかresults: nullのことがあるのでハンドリング
-            //     throw new factory.errors.ServiceUnavailable('incr orderNumber result not array');
-            // }
             // tslint:disable-next-line:no-single-line-block-comment
-            /* istanbul ignore else: please write tests */
-            if (typeof incrReply === 'number') {
-                let orderNumber = timestamp;
-                const no = incrReply;
-                orderNumber = `${orderNumber}${no}`;
-                // checkdigit
-                const cd = cdigit.luhn.compute(orderNumber);
-                const cipher = fpe({ password: cd });
-                orderNumber = cipher.encrypt(orderNumber);
-                orderNumber = `${projectPrefix}${cd}${orderNumber}`;
-                orderNumber = `${[
-                    // tslint:disable-next-line:no-magic-numbers
-                    orderNumber.slice(0, 4),
-                    // tslint:disable-next-line:no-magic-numbers
-                    orderNumber.slice(4, 11),
-                    // tslint:disable-next-line:no-magic-numbers
-                    orderNumber.slice(11)
-                ].join('-')}`;
-                return orderNumber;
-            }
-            else {
+            /* istanbul ignore if */
+            if (typeof incrReply !== 'number') {
                 // 基本的にありえないフロー
-                throw new factory.errors.ServiceUnavailable('Order number not published');
+                throw new factory.errors.ServiceUnavailable('order number not incremented unexpectedly');
             }
+            let orderNumber = `${timestamp}${incrReply}`;
+            // checkdigit
+            const cd = cdigit.luhn.compute(orderNumber);
+            orderNumber = fpe({ password: cd })
+                .encrypt(orderNumber);
+            orderNumber = `${projectPrefix}${cd}${orderNumber}`;
+            orderNumber = `${[
+                // tslint:disable-next-line:no-magic-numbers
+                orderNumber.slice(0, 4),
+                // tslint:disable-next-line:no-magic-numbers
+                orderNumber.slice(4, 11),
+                // tslint:disable-next-line:no-magic-numbers
+                orderNumber.slice(11)
+            ].join(ORDER_NUMBER_SEPARATOR)}`;
+            return orderNumber;
         });
     }
 }
+RedisRepository.REDIS_KEY_PREFIX_NEW = 'orderNumber';
 RedisRepository.REDIS_KEY_PREFIX = 'cinerino:orderNumber';
 exports.RedisRepository = RedisRepository;

package/lib/chevre/settings.d.ts

@@ -30,6 +30,7 @@ export declare const DEFAULT_PAYMENT_METHOD_TYPE_FOR_CREDIT_CARD: string;
 export declare const USE_ASSET_TRANSACTION_SYNC_PROCESSING: boolean;
 export declare const USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING: boolean;
 export declare const USE_NEW_EVENT_AVAILABILITY_KEY_FROM: moment.Moment;
+export declare const USE_NEW_ORDER_NUMBER_KEY_FROM: moment.Moment;
 /**
  * グローバル設定
  */

package/lib/chevre/settings.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.settings = exports.USE_NEW_EVENT_AVAILABILITY_KEY_FROM = exports.USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING = exports.USE_ASSET_TRANSACTION_SYNC_PROCESSING = exports.DEFAULT_PAYMENT_METHOD_TYPE_FOR_CREDIT_CARD = exports.DEFAULT_SENDER_EMAIL = exports.TRANSACTION_CANCELED_STORAGE_PERIOD_IN_DAYS = exports.TRANSACTION_CONFIRMED_STORAGE_PERIOD_IN_DAYS = exports.ASSET_TRANSACTION_STORAGE_PERIOD_IN_DAYS = exports.ABORTED_TASKS_WITHOUT_REPORT = void 0;
+exports.settings = exports.USE_NEW_ORDER_NUMBER_KEY_FROM = exports.USE_NEW_EVENT_AVAILABILITY_KEY_FROM = exports.USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING = exports.USE_ASSET_TRANSACTION_SYNC_PROCESSING = exports.DEFAULT_PAYMENT_METHOD_TYPE_FOR_CREDIT_CARD = exports.DEFAULT_SENDER_EMAIL = exports.TRANSACTION_CANCELED_STORAGE_PERIOD_IN_DAYS = exports.TRANSACTION_CONFIRMED_STORAGE_PERIOD_IN_DAYS = exports.ASSET_TRANSACTION_STORAGE_PERIOD_IN_DAYS = exports.ABORTED_TASKS_WITHOUT_REPORT = void 0;
 const moment = require("moment");
 const factory = require("./factory");
 const transactionWebhookUrls = (typeof process.env.INFORM_TRANSACTION_URL === 'string')
@@ -49,6 +49,9 @@ exports.USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING = process.env.USE_PAY_ASSET_TR
 exports.USE_NEW_EVENT_AVAILABILITY_KEY_FROM = (typeof process.env.USE_NEW_EVENT_AVAILABILITY_KEY_FROM === 'string')
     ? moment(process.env.USE_NEW_EVENT_AVAILABILITY_KEY_FROM)
     : moment('2023-07-23T15:00:00Z');
+exports.USE_NEW_ORDER_NUMBER_KEY_FROM = (typeof process.env.USE_NEW_ORDER_NUMBER_KEY_FROM === 'string')
+    ? moment(process.env.USE_NEW_ORDER_NUMBER_KEY_FROM)
+    : moment('2023-04-30T15:00:00Z');
 /**
  * グローバル設定
  */

package/package.json

@@ -117,5 +117,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.2.0-alpha.0"
+  "version": "21.2.0-alpha.1"
 }