@chevre/domain 21.1.0-alpha.2 → 21.1.0

package/example/src/chevre/publishConfirmationNumber.ts

@@ -0,0 +1,27 @@
+// 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: {
+            host: process.env.REDIS_HOST,
+            port: Number(process.env.REDIS_PORT)
+        },
+        password: process.env.REDIS_KEY
+    });
+    await client.connect();
+
+    const confirmationNumberRepo = new chevre.repository.ConfirmationNumber(client);
+    await confirmationNumberRepo.publish({ orderDate: new Date() });
+}
+
+main()
+    .then(() => {
+        console.log('success!');
+    })
+    .catch(console.error);

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()
+            const [setNXReply] = 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 (setNXReply === 1 || setNXReply === true) {
                 return true;
             }
             else {

package/lib/chevre/repo/confirmationNumber.js

@@ -44,18 +44,18 @@ class RedisRepository {
             const key = util.format('%s:%s', RedisRepository.REDIS_KEY_PREFIX, moment(params.orderDate)
                 .tz('Asia/Tokyo')
                 .format('YYMM'));
-            const results = yield this.redisClient.multi()
+            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');
-            }
+            // 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 results[0] === 'number') {
-                const no = results[0];
+            if (typeof incrReply === 'number') {
+                const no = incrReply;
                 // debug('no incremented.', no);
                 // 桁数調整
                 let confirmationNumber = RedisRepository.ALIGN_DIGITS(String(no));

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');
             }
         });
     }
@@ -94,10 +94,9 @@ class RedisRepository {
         return __awaiter(this, void 0, void 0, function* () {
             const key = `${RedisRepository.KEY_PREFIX}:${params.eventId}`;
             const field = RedisRepository.OFFER2FIELD(params.offer);
-            const reply = yield this.redisClient.multi()
+            yield this.redisClient.multi()
                 .hDel(key, field)
                 .exec();
-            debug('reply:', reply);
         });
     }
     /**

package/lib/chevre/repo/orderNumber.js

@@ -38,20 +38,19 @@ class RedisRepository {
                 .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()
+            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');
-            }
+            // 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') {
+            if (typeof incrReply === 'number') {
                 let orderNumber = timestamp;
-                const no = results[0];
-                // orderNumber = `${orderNumber}${(`${no}`).slice(-1)}`; // ミリ秒あたり10件以内の注文想定
+                const no = incrReply;
                 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,24 +35,21 @@ 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()
+            const [incrReply] = 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') {
+            if (typeof incrReply === 'number') {
                 let identifier = timestamp;
-                const no = results[0];
-                debug('no incremented.', no);
+                const no = incrReply;
                 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,30 +35,21 @@ 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 results = yield this.redisClient.multi()
+            const key = util.format('%s:%s', RedisRepository.REDIS_KEY_PREFIX, timestamp);
+            const [incrReply] = 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') {
+            if (typeof incrReply === 'number') {
                 let transactionNumber = timestamp;
-                const no = results[0];
-                debug('no incremented.', no);
+                const no = incrReply;
                 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"
 }