@chevre/domain 21.1.0-alpha.2 → 21.1.0-alpha.3

package/lib/chevre/repo/action/registerServiceInProgress.js

@@ -10,8 +10,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RedisRepository = void 0;
-const createDebug = require("debug");
-const debug = createDebug('chevre:repository');
 /**
  * 進行中サービス登録アクションリポジトリ
  */
@@ -26,14 +24,13 @@ class RedisRepository {
         return __awaiter(this, void 0, void 0, function* () {
             const key = `${RedisRepository.KEY_PREFIX}:${progressKey.agent.id}:${progressKey.product.id}`;
             const ttl = 7200;
-            debug('locking...', key, ttl);
             const results = yield this.redisClient.multi()
                 .setNX(key, holder)
                 .expire(key, ttl)
                 .exec();
             // tslint:disable-next-line:no-single-line-block-comment
             /* istanbul ignore else: please write tests */
-            if (results[0] === 1 || results[0] === true) {
+            if (Array.isArray(results) && (results[0] === 1 || results[0] === true)) {
                 return true;
             }
             else {

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

@@ -83,7 +83,7 @@ class RedisRepository {
                         .hDel(key, lockedFields)
                         .exec();
                 }
-                throw new factory.errors.AlreadyInUse('', [], 'Seat number already hold');
+                throw new factory.errors.AlreadyInUse(factory.reservationType.EventReservation, ['ticketedSeat'], 'Already hold');
             }
         });
     }

package/lib/chevre/repo/orderNumber.js

@@ -51,7 +51,6 @@ class RedisRepository {
             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);

package/lib/chevre/repo/serviceOutputIdentifier.js

@@ -11,13 +11,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RedisRepository = void 0;
 const cdigit = require("cdigit");
-const createDebug = require("debug");
 const moment = require("moment-timezone");
 const util = require("util");
 // tslint:disable-next-line:no-require-imports no-var-requires
 const fpe = require('node-fpe');
 const factory = require("../factory");
-const debug = createDebug('chevre-domain:repo');
 /**
  * サービスアウトプット識別子リポジトリ
  */
@@ -37,7 +35,6 @@ class RedisRepository {
             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)
@@ -48,13 +45,11 @@ class RedisRepository {
             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;
             }

package/lib/chevre/repo/transactionNumber.js

@@ -11,13 +11,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RedisRepository = void 0;
 const cdigit = require("cdigit");
-const createDebug = require("debug");
 const moment = require("moment-timezone");
 const util = require("util");
 // tslint:disable-next-line:no-require-imports no-var-requires
 const fpe = require('node-fpe');
 const factory = require("../factory");
-const debug = createDebug('chevre-domain:repo');
 /**
  * 取引番号リポジトリ
  */
@@ -30,9 +28,6 @@ class RedisRepository {
      */
     publishByTimestamp(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            // tslint:disable-next-line:no-magic-numbers
-            // const projectPrefix = params.project.id.slice(0, 3)
-            //     .toUpperCase();
             const timestamp = moment(params.startDate)
                 .valueOf()
                 .toString();
@@ -40,12 +35,7 @@ class RedisRepository {
             const TTL = moment(params.startDate)
                 .add(1, 'minute') // ミリ秒でカウントしていくので、予約日時後1分で十分
                 .diff(now, 'seconds');
-            debug(`TTL:${TTL} seconds`);
-            const key = util.format(
-            // '%s:%s:%s',
-            '%s:%s', RedisRepository.REDIS_KEY_PREFIX, 
-            // projectPrefix,
-            timestamp);
+            const key = util.format('%s:%s', RedisRepository.REDIS_KEY_PREFIX, timestamp);
             const results = yield this.redisClient.multi()
                 .incr(key)
                 .expire(key, TTL)
@@ -55,15 +45,11 @@ class RedisRepository {
             if (Array.isArray(results) && typeof results[0] === 'number') {
                 let transactionNumber = timestamp;
                 const no = results[0];
-                debug('no incremented.', no);
                 transactionNumber = `${transactionNumber}${no}`;
                 // checkdigit
                 const cd = cdigit.luhn.compute(transactionNumber);
                 const cipher = fpe({ password: cd });
                 transactionNumber = cipher.encrypt(transactionNumber);
-                // debug('publishing transactionNumber from', projectPrefix, timestamp, no, cd);
-                // transactionNumber = `${projectPrefix}${cd}${transactionNumber}`;
-                debug('publishing transactionNumber from', timestamp, no, cd);
                 transactionNumber = `${cd}${transactionNumber}`;
                 return { transactionNumber };
             }

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.1.0-alpha.2"
+  "version": "21.1.0-alpha.3"
 }