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

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

@@ -36,34 +36,15 @@ class RedisRepository {
     lockIfNotLimitExceeded(lockKey, maximum) {
         return __awaiter(this, void 0, void 0, function* () {
             const key = `${RedisRepository.KEY_PREFIX}:${lockKey.eventId}`;
-            yield new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
-                this.redisClient.watch(key, (watchError) => {
-                    if (watchError !== null) {
-                        reject(watchError);
-                        return;
-                    }
-                    this.redisClient.hlen(key, (hlenError, hashCount) => __awaiter(this, void 0, void 0, function* () {
-                        if (hlenError !== null) {
-                            reject(hlenError);
-                            return;
-                        }
-                        // Process result
-                        // Heavy and time consuming operation here
-                        debug('checking hash count...hashCount:', hashCount);
-                        if (hashCount + lockKey.offers.length > maximum) {
-                            reject(new factory.errors.Argument('Event', 'maximumAttendeeCapacity exceeded'));
-                            return;
-                        }
-                        try {
-                            yield this.lock(lockKey);
-                            resolve();
-                        }
-                        catch (error) {
-                            reject(error);
-                        }
-                    }));
-                });
-            }));
+            yield this.redisClient.watch(key);
+            const hashCount = yield this.redisClient.hLen(key);
+            // Process result
+            // Heavy and time consuming operation here
+            debug('checking hash count...hashCount:', hashCount);
+            if (hashCount + lockKey.offers.length > maximum) {
+                throw new factory.errors.Argument('Event', 'maximumAttendeeCapacity exceeded');
+            }
+            yield this.lock(lockKey);
         });
     }
     /**
@@ -77,21 +58,12 @@ class RedisRepository {
             const multi = this.redisClient.multi();
             const fields = lockKey.offers.map((offer) => RedisRepository.OFFER2FIELD(offer));
             fields.forEach((field) => {
-                multi.hsetnx(key, field, value);
-            });
-            const results = yield new Promise((resolve, reject) => {
-                multi.expireat(key, moment(lockKey.expires)
-                    .unix())
-                    .exec((err, reply) => {
-                    debug('reply:', reply);
-                    if (err !== null) {
-                        reject(err);
-                    }
-                    else {
-                        resolve(reply);
-                    }
-                });
+                multi.hSetNX(key, field, value);
             });
+            const results = yield multi.expireAt(key, moment(lockKey.expires)
+                .unix())
+                .exec();
+            debug('results:', results);
             const lockedFields = [];
             if (Array.isArray(results)) {
                 results.slice(0, fields.length)
@@ -107,19 +79,9 @@ class RedisRepository {
             if (!lockedAll) {
                 if (lockedFields.length > 0) {
                     // 全て仮押さえできなければ仮押さえできたものは解除
-                    yield new Promise((resolve, reject) => {
-                        this.redisClient.multi()
-                            .hdel(key, lockedFields)
-                            .exec((err, reply) => {
-                            debug('reply:', reply);
-                            if (err !== null) {
-                                reject(err);
-                            }
-                            else {
-                                resolve();
-                            }
-                        });
-                    });
+                    yield this.redisClient.multi()
+                        .hDel(key, lockedFields)
+                        .exec();
                 }
                 throw new factory.errors.AlreadyInUse('', [], 'Seat number already hold');
             }
@@ -132,19 +94,10 @@ class RedisRepository {
         return __awaiter(this, void 0, void 0, function* () {
             const key = `${RedisRepository.KEY_PREFIX}:${params.eventId}`;
             const field = RedisRepository.OFFER2FIELD(params.offer);
-            yield new Promise((resolve, reject) => {
-                this.redisClient.multi()
-                    .hdel(key, field)
-                    .exec((err, reply) => {
-                    debug('reply:', reply);
-                    if (err !== null) {
-                        reject(err);
-                    }
-                    else {
-                        resolve();
-                    }
-                });
-            });
+            const reply = yield this.redisClient.multi()
+                .hDel(key, field)
+                .exec();
+            debug('reply:', reply);
         });
     }
     /**
@@ -153,26 +106,17 @@ class RedisRepository {
     findUnavailableOffersByEventId(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const key = `${RedisRepository.KEY_PREFIX}:${params.eventId}`;
-            return new Promise((resolve, reject) => {
-                this.redisClient.hgetall(key, (err, reply) => {
-                    debug('reply:', reply);
-                    if (err !== null) {
-                        reject(err);
-                    }
-                    else {
-                        let offers = [];
-                        if (reply !== null) {
-                            offers = Object.keys(reply)
-                                .map((field) => {
-                                const seatSection = field.split(':')[0];
-                                const seatNumber = field.split(':')[1];
-                                return { seatSection, seatNumber };
-                            });
-                        }
-                        resolve(offers);
-                    }
+            const reply = yield this.redisClient.hGetAll(key);
+            let offers = [];
+            if (reply !== null) {
+                offers = Object.keys(reply)
+                    .map((field) => {
+                    const seatSection = field.split(':')[0];
+                    const seatNumber = field.split(':')[1];
+                    return { seatSection, seatNumber };
                 });
-            });
+            }
+            return offers;
         });
     }
     /**
@@ -181,20 +125,12 @@ class RedisRepository {
     countUnavailableOffers(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const key = `${RedisRepository.KEY_PREFIX}:${params.event.id}`;
-            return new Promise((resolve, reject) => {
-                this.redisClient.hlen(key, (err, reply) => {
-                    if (err !== null) {
-                        reject(err);
-                    }
-                    else {
-                        let fieldCount = 0;
-                        if (typeof reply === 'number') {
-                            fieldCount = Number(reply);
-                        }
-                        resolve(fieldCount);
-                    }
-                });
-            });
+            const reply = yield this.redisClient.hLen(key);
+            let fieldCount = 0;
+            if (typeof reply === 'number') {
+                fieldCount = Number(reply);
+            }
+            return fieldCount;
         });
     }
     /**
@@ -202,20 +138,9 @@ class RedisRepository {
      */
     getHolder(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            return new Promise((resolve, reject) => {
-                const key = `${RedisRepository.KEY_PREFIX}:${params.eventId}`;
-                const field = RedisRepository.OFFER2FIELD(params.offer);
-                this.redisClient.hget(key, field, (err, result) => {
-                    debug('result:', err, result);
-                    if (err !== null) {
-                        reject(err);
-                    }
-                    else {
-                        // tslint:disable-next-line:no-magic-numbers
-                        resolve(result);
-                    }
-                });
-            });
+            const key = `${RedisRepository.KEY_PREFIX}:${params.eventId}`;
+            const field = RedisRepository.OFFER2FIELD(params.offer);
+            return this.redisClient.hGet(key, field);
         });
     }
     /**
@@ -224,29 +149,19 @@ class RedisRepository {
      */
     searchAvailability(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            return new Promise((resolve, reject) => {
-                const key = `${RedisRepository.KEY_PREFIX}:${params.eventId}`;
-                const fields = params.offers.map((o) => {
-                    return RedisRepository.OFFER2FIELD(o);
-                });
-                this.redisClient.hmget(key, fields, (err, result) => {
-                    if (err !== null) {
-                        reject(err);
-                    }
-                    else {
-                        if (!Array.isArray(result)) {
-                            reject(new factory.errors.ServiceUnavailable(`searchAvailability got non-array: ${typeof result}`));
-                            return;
-                        }
-                        // tslint:disable-next-line:no-magic-numbers
-                        resolve(params.offers.map((o, index) => {
-                            const value4offer = result[index];
-                            return Object.assign(Object.assign({}, o), { availability: (typeof value4offer === 'string')
-                                    ? factory.itemAvailability.OutOfStock
-                                    : factory.itemAvailability.InStock });
-                        }));
-                    }
-                });
+            const key = `${RedisRepository.KEY_PREFIX}:${params.eventId}`;
+            const fields = params.offers.map((o) => {
+                return RedisRepository.OFFER2FIELD(o);
+            });
+            const result = yield this.redisClient.hmGet(key, fields);
+            if (!Array.isArray(result)) {
+                throw new factory.errors.ServiceUnavailable(`searchAvailability got non-array: ${typeof result}`);
+            }
+            return params.offers.map((o, index) => {
+                const value4offer = result[index];
+                return Object.assign(Object.assign({}, o), { availability: (typeof value4offer === 'string')
+                        ? factory.itemAvailability.OutOfStock
+                        : factory.itemAvailability.InStock });
             });
         });
     }

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

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

package/lib/chevre/repo/orderNumber.js

@@ -28,61 +28,50 @@ class RedisRepository {
      */
     publishByTimestamp(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            return new Promise((resolve, reject) => {
-                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 = util.format('%s:%s:%s', RedisRepository.REDIS_KEY_PREFIX, projectPrefix, timestamp);
-                this.redisClient.multi()
-                    .incr(key)
-                    .expire(key, TTL)
-                    .exec((err, results) => {
-                    // tslint:disable-next-line:no-single-line-block-comment
-                    /* istanbul ignore if: please write tests */
-                    if (err instanceof Error) {
-                        reject(err);
-                    }
-                    else {
-                        if (!Array.isArray(results)) {
-                            // なぜかresults: nullのことがあるのでハンドリング
-                            reject(new factory.errors.ServiceUnavailable('incr orderNumber result not array'));
-                            return;
-                        }
-                        // tslint:disable-next-line:no-single-line-block-comment
-                        /* istanbul ignore else: please write tests */
-                        if (typeof results[0] === 'number') {
-                            let orderNumber = timestamp;
-                            const no = results[0];
-                            // orderNumber = `${orderNumber}${(`${no}`).slice(-1)}`; // ミリ秒あたり10件以内の注文想定
-                            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('-')}`;
-                            resolve(orderNumber);
-                        }
-                        else {
-                            // 基本的にありえないフロー
-                            reject(new factory.errors.ServiceUnavailable('Order number not published'));
-                        }
-                    }
-                });
-            });
+            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 = util.format('%s:%s:%s', RedisRepository.REDIS_KEY_PREFIX, projectPrefix, timestamp);
+            const results = 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 results[0] === 'number') {
+                let orderNumber = timestamp;
+                const no = results[0];
+                // orderNumber = `${orderNumber}${(`${no}`).slice(-1)}`; // ミリ秒あたり10件以内の注文想定
+                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 {
+                // 基本的にありえないフロー
+                throw new factory.errors.ServiceUnavailable('Order number not published');
+            }
         });
     }
 }

package/lib/chevre/repo/rateLimit/offer.d.ts

@@ -1,4 +1,4 @@
-import * as redis from 'redis';
+import { RedisClientType } from 'redis';
 import * as factory from '../../factory';
 /**
  * レート制限キーインターフェース
@@ -20,7 +20,7 @@ export interface IRateLimitKey {
 export declare class RedisRepository {
     static KEY_PREFIX: string;
     private readonly redisClient;
-    constructor(redisClient: redis.RedisClient);
+    constructor(redisClient: RedisClientType);
     static CREATE_REDIS_KEY(ratelimitKey: IRateLimitKey): string;
     /**
      * ロックする

package/lib/chevre/repo/rateLimit/offer.js

@@ -44,20 +44,10 @@ class RedisRepository {
             let multi = this.redisClient.multi();
             datasets.forEach((dataset) => {
                 debug('setting if not exist...', dataset.key);
-                multi.setnx(dataset.key, dataset.value)
+                multi.setNX(dataset.key, dataset.value)
                     .expire(dataset.key, dataset.ttl);
             });
-            const results = yield new Promise((resolve, reject) => {
-                multi.exec((err, reply) => {
-                    debug('reply:', reply);
-                    if (err !== null) {
-                        reject(err);
-                    }
-                    else {
-                        resolve(reply);
-                    }
-                });
-            });
+            const results = yield multi.exec();
             const lockedFields = [];
             results.forEach((r, index) => {
                 debug('r, index:', r, index);
@@ -78,17 +68,7 @@ class RedisRepository {
                         debug('deleting...', key);
                         multi.del(key);
                     });
-                    yield new Promise((resolve, reject) => {
-                        multi.exec((err, reply) => {
-                            debug('reply:', reply);
-                            if (err !== null) {
-                                reject(err);
-                            }
-                            else {
-                                resolve();
-                            }
-                        });
-                    });
+                    yield multi.exec();
                 }
                 throw new factory.errors.RateLimitExceeded('Offer');
             }
@@ -102,32 +82,13 @@ class RedisRepository {
                 debug('deleting...', key);
                 multi.del(key);
             });
-            yield new Promise((resolve, reject) => {
-                multi.exec((err, reply) => {
-                    debug('reply:', reply);
-                    if (err !== null) {
-                        reject(err);
-                    }
-                    else {
-                        resolve();
-                    }
-                });
-            });
+            yield multi.exec();
         });
     }
     getHolder(ratelimitKey) {
         return __awaiter(this, void 0, void 0, function* () {
-            return new Promise((resolve, reject) => {
-                const key = RedisRepository.CREATE_REDIS_KEY(ratelimitKey);
-                this.redisClient.get(key, (err, result) => {
-                    if (err !== null) {
-                        reject(err);
-                    }
-                    else {
-                        resolve(result);
-                    }
-                });
-            });
+            const key = RedisRepository.CREATE_REDIS_KEY(ratelimitKey);
+            return this.redisClient.get(key);
         });
     }
 }

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

@@ -1,11 +1,11 @@
-import * as redis from 'redis';
+import { RedisClientType } from 'redis';
 /**
  * サービスアウトプット識別子リポジトリ
  */
 export declare class RedisRepository {
     static REDIS_KEY_PREFIX: string;
     private readonly redisClient;
-    constructor(redisClient: redis.RedisClient);
+    constructor(redisClient: RedisClientType);
     /**
      * タイムスタンプから発行する
      */

package/lib/chevre/repo/serviceOutputIdentifier.js

@@ -30,52 +30,38 @@ class RedisRepository {
      */
     publishByTimestamp(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            return new Promise((resolve, reject) => {
-                // tslint:disable-next-line:no-magic-numbers
-                // const projectPrefix = params.project.id.slice(0, 3)
-                //     .toUpperCase();
-                const timestamp = moment(params.startDate)
-                    .valueOf()
-                    .toString();
-                const now = moment();
-                const TTL = moment(params.startDate)
-                    .add(1, 'minute') // ミリ秒でカウントしていくので、予約日時後1分で十分
-                    .diff(now, 'seconds');
-                debug(`TTL:${TTL} seconds`);
-                const key = util.format('%s:%s', RedisRepository.REDIS_KEY_PREFIX, timestamp);
-                this.redisClient.multi()
-                    .incr(key, debug)
-                    .expire(key, TTL)
-                    .exec((err, results) => {
-                    debug('results:', results);
-                    // tslint:disable-next-line:no-single-line-block-comment
-                    /* istanbul ignore if: please write tests */
-                    if (err instanceof Error) {
-                        reject(err);
-                    }
-                    else {
-                        // tslint:disable-next-line:no-single-line-block-comment
-                        /* istanbul ignore else: please write tests */
-                        if (Array.isArray(results) && Number.isInteger(results[0])) {
-                            let identifier = timestamp;
-                            const no = results[0];
-                            debug('no incremented.', no);
-                            identifier = `${identifier}${no}`;
-                            // checkdigit
-                            const cd = cdigit.luhn.compute(identifier);
-                            const cipher = fpe({ password: cd });
-                            identifier = cipher.encrypt(identifier);
-                            debug('publishing serviceOutputIdentifier from', timestamp, no, cd);
-                            identifier = `${cd}${identifier}`;
-                            resolve(identifier);
-                        }
-                        else {
-                            // 基本的にありえないフロー
-                            reject(new factory.errors.ServiceUnavailable('ServiceOutput identifier not published'));
-                        }
-                    }
-                });
-            });
+            const timestamp = moment(params.startDate)
+                .valueOf()
+                .toString();
+            const now = moment();
+            const TTL = moment(params.startDate)
+                .add(1, 'minute') // ミリ秒でカウントしていくので、予約日時後1分で十分
+                .diff(now, 'seconds');
+            debug(`TTL:${TTL} seconds`);
+            const key = util.format('%s:%s', RedisRepository.REDIS_KEY_PREFIX, timestamp);
+            const results = 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 (Array.isArray(results) && typeof results[0] === 'number') {
+                let identifier = timestamp;
+                const no = results[0];
+                debug('no incremented.', no);
+                identifier = `${identifier}${no}`;
+                // checkdigit
+                const cd = cdigit.luhn.compute(identifier);
+                const cipher = fpe({ password: cd });
+                identifier = cipher.encrypt(identifier);
+                debug('publishing serviceOutputIdentifier from', timestamp, no, cd);
+                identifier = `${cd}${identifier}`;
+                return identifier;
+            }
+            else {
+                // 基本的にありえないフロー
+                throw new factory.errors.ServiceUnavailable('ServiceOutput identifier not published');
+            }
         });
     }
 }

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

@@ -1,4 +1,4 @@
-import * as redis from 'redis';
+import { RedisClientType } from 'redis';
 interface IPublishResult {
     transactionNumber: string;
 }
@@ -8,7 +8,7 @@ interface IPublishResult {
 export declare class RedisRepository {
     static REDIS_KEY_PREFIX: string;
     private readonly redisClient;
-    constructor(redisClient: redis.RedisClient);
+    constructor(redisClient: RedisClientType);
     /**
      * タイムスタンプから発行する
      */