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

package/example/src/chevre/aggregateAllEvents2.ts

@@ -1,3 +1,4 @@
+// tslint:disable:no-console
 /**
  * イベント集計タスク実行
  */
@@ -6,14 +7,16 @@ import { chevre } from '../../../lib/index';
 import * as mongoose from 'mongoose';
 import * as redis from 'redis';
 
-const redisClient = redis.createClient({
-    port: Number(<string>process.env.REDIS_PORT),
-    host: <string>process.env.REDIS_HOST,
-    password: <string>process.env.REDIS_KEY,
-    tls: (process.env.REDIS_TLS_SERVERNAME !== undefined) ? { servername: process.env.REDIS_TLS_SERVERNAME } : undefined
-});
-
 export async function aggregateScreeningEvent() {
+    const redisClient = 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 redisClient.connect();
+
     await mongoose.connect(<string>process.env.MONGOLAB_URI);
 
     let count = 0;

package/example/src/chevre/aggregateEventReservation.ts

@@ -8,11 +8,14 @@ import { chevre } from '../../../lib/index';
 
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI);
-    const client = redis.createClient({
-        host: process.env.REDIS_HOST,
-        port: Number(process.env.REDIS_PORT),
-        password: process.env.REDIS_KEY
+    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 now = new Date();
     await chevre.service.aggregation.event.aggregateScreeningEvent({

package/example/src/chevre/processPay.ts

@@ -9,11 +9,14 @@ const project = { id: String(process.env.PROJECT_ID) };
 
 // tslint:disable-next-line:max-func-body-length
 async function main() {
-    const client = redis.createClient({
-        host: process.env.REDIS_HOST,
-        port: Number(process.env.REDIS_PORT),
-        password: process.env.REDIS_KEY
+    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();
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
     const accountingReportRepo = new chevre.repository.AccountingReport(mongoose.connection);

package/example/src/chevre/processRegisterMembership.ts

@@ -9,11 +9,6 @@ const project = { id: String(process.env.PROJECT_ID) };
 
 // tslint:disable-next-line:max-func-body-length
 async function main() {
-    // const client = redis.createClient({
-    //     host: process.env.REDIS_HOST,
-    //     port: Number(process.env.REDIS_PORT),
-    //     password: process.env.REDIS_KEY
-    // });
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
     const accountRepo = new chevre.repository.Account(mongoose.connection);

package/example/src/chevre/processRegisterPaymentCard.ts

@@ -9,11 +9,6 @@ const project = { id: String(process.env.PROJECT_ID) };
 
 // tslint:disable-next-line:max-func-body-length
 async function main() {
-    // const client = redis.createClient({
-    //     host: process.env.REDIS_HOST,
-    //     port: Number(process.env.REDIS_PORT),
-    //     password: process.env.REDIS_KEY
-    // });
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
     const accountRepo = new chevre.repository.Account(mongoose.connection);

package/example/src/chevre/processReserve.ts

@@ -9,11 +9,14 @@ const project = { id: String(process.env.PROJECT_ID) };
 
 // tslint:disable-next-line:max-func-body-length
 async function main() {
-    const client = redis.createClient({
-        host: process.env.REDIS_HOST,
-        port: Number(process.env.REDIS_PORT),
-        password: process.env.REDIS_KEY
+    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();
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
     const offerRepo = new chevre.repository.Offer(mongoose.connection);

package/example/src/chevre/redisConfig.ts

@@ -0,0 +1,32 @@
+// tslint:disable:no-console
+import * as redis from 'redis';
+
+// const project = { id: String(process.env.PROJECT_ID) };
+
+// tslint:disable-next-line:max-func-body-length
+async function main() {
+    const client = redis.createClient({
+        socket: {
+            host: process.env.REDIS_HOST,
+            port: Number(process.env.REDIS_PORT)
+        },
+        password: process.env.REDIS_KEY
+    });
+    await client.connect();
+
+    console.log(await client.info());
+
+    const key = 'sampleTest';
+    const ttl = 60;
+    const results = await client.multi()
+        .setNX(key, '1')
+        .expire(key, ttl)
+        .exec();
+    console.log('results:', results);
+}
+
+main()
+    .then(() => {
+        console.log('success!');
+    })
+    .catch(console.error);

package/example/src/chevre/searchEventTicketOffers.ts

@@ -6,13 +6,16 @@ import { chevre } from '../../../lib/index';
 
 // const PROJECT_ID = process.env.PROJECT_ID;
 
-const client = redis.createClient({
-    host: process.env.REDIS_HOST,
-    port: Number(process.env.REDIS_PORT),
-    password: process.env.REDIS_KEY
-});
-
 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();
+
     await mongoose.connect(<string>process.env.MONGOLAB_URI);
 
     const eventRepo = new chevre.repository.Event(mongoose.connection);

package/example/src/chevre/transaction/callOrderMembershipServiceTask.ts

@@ -10,11 +10,14 @@ const project = { id: String(process.env.PROJECT_ID) };
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
-    const redisClient = redis.createClient({
-        host: process.env.REDIS_HOST,
-        port: Number(process.env.REDIS_PORT),
-        password: process.env.REDIS_KEY
+    const redisClient = 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 redisClient.connect();
 
     const result = await call(
         {

package/example/src/chevre/transaction/orderMembershipService.ts

@@ -10,11 +10,14 @@ const project = { id: String(process.env.PROJECT_ID) };
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
-    const redisClient = redis.createClient({
-        host: process.env.REDIS_HOST,
-        port: Number(process.env.REDIS_PORT),
-        password: process.env.REDIS_KEY
+    const redisClient = 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 redisClient.connect();
 
     const personRepo = new chevre.repository.Person({ userPoolId: chevre.settings.userPoolIdNew });
     const actionRepo = new chevre.repository.Action(mongoose.connection);

package/lib/chevre/repo/action/registerServiceInProgress.d.ts

@@ -1,4 +1,4 @@
-import * as redis from 'redis';
+import { RedisClientType } from 'redis';
 /**
  * 進行アクションキーインターフェース
  */
@@ -16,11 +16,11 @@ export interface IProgressKey {
 export declare class RedisRepository {
     private static readonly KEY_PREFIX;
     private readonly redisClient;
-    constructor(redisClient: redis.RedisClient);
+    constructor(redisClient: RedisClientType);
     /**
      * ロックする
      */
-    lock(progressKey: IProgressKey, holder: string): Promise<number>;
+    lock(progressKey: IProgressKey, holder: string): Promise<boolean>;
     /**
      * メンバーシップ登録進行ロックを解除する
      */

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

@@ -24,32 +24,21 @@ class RedisRepository {
      */
     lock(progressKey, holder) {
         return __awaiter(this, void 0, void 0, function* () {
-            return new Promise((resolve, reject) => {
-                const key = `${RedisRepository.KEY_PREFIX}:${progressKey.agent.id}:${progressKey.product.id}`;
-                const ttl = 7200;
-                debug('locking...', key, ttl);
-                this.redisClient.multi()
-                    .setnx(key, holder, debug)
-                    .expire(key, ttl, debug)
-                    .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 (results[0] === 1) {
-                            resolve(results[0]);
-                        }
-                        else {
-                            reject(new Error('Already in progress.'));
-                        }
-                    }
-                });
-            });
+            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) {
+                return true;
+            }
+            else {
+                throw new Error('Already in progress.');
+            }
         });
     }
     /**
@@ -57,37 +46,14 @@ class RedisRepository {
      */
     unlock(progressKey) {
         return __awaiter(this, void 0, void 0, function* () {
-            return new Promise((resolve, reject) => {
-                const key = `${RedisRepository.KEY_PREFIX}:${progressKey.agent.id}:${progressKey.product.id}`;
-                this.redisClient.del([key], (err, res) => {
-                    debug(err, res);
-                    // tslint:disable-next-line:no-single-line-block-comment
-                    /* istanbul ignore if: please write tests */
-                    if (err instanceof Error) {
-                        reject(err);
-                    }
-                    else {
-                        resolve();
-                    }
-                });
-            });
+            const key = `${RedisRepository.KEY_PREFIX}:${progressKey.agent.id}:${progressKey.product.id}`;
+            yield this.redisClient.del([key]);
         });
     }
     getHolder(progressKey) {
         return __awaiter(this, void 0, void 0, function* () {
-            return new Promise((resolve, reject) => {
-                const key = `${RedisRepository.KEY_PREFIX}:${progressKey.agent.id}:${progressKey.product.id}`;
-                this.redisClient.get(key, (err, res) => {
-                    // tslint:disable-next-line:no-single-line-block-comment
-                    /* istanbul ignore if: please write tests */
-                    if (err instanceof Error) {
-                        reject(err);
-                    }
-                    else {
-                        resolve(res);
-                    }
-                });
-            });
+            const key = `${RedisRepository.KEY_PREFIX}:${progressKey.agent.id}:${progressKey.product.id}`;
+            return this.redisClient.get(key);
         });
     }
 }

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

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

package/lib/chevre/repo/confirmationNumber.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:repository');
 const CONFIRMATION_NUMBER_MIN_LENGH = 4;
 /**
  * 確認番号リポジトリ
@@ -39,57 +37,46 @@ class RedisRepository {
      */
     publish(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            return new Promise((resolve, reject) => {
-                // データ保管期間はとりあえず一か月
-                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'));
-                this.redisClient.multi()
-                    .incr(key, debug)
-                    .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 confirmationNumber result not array'));
-                            return;
-                        }
-                        // tslint:disable-next-line:no-single-line-block-comment
-                        /* istanbul ignore else: please write tests */
-                        if (typeof results[0] === 'number') {
-                            const no = results[0];
-                            // 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))
-                            // );
-                            resolve(confirmationNumber);
-                        }
-                        else {
-                            // 基本的にありえないフロー
-                            reject(new factory.errors.ServiceUnavailable('Confirmation number not published'));
-                        }
-                    }
-                });
-            });
+            // データ保管期間はとりあえず一か月
+            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 results = 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 results[0] === 'number') {
+                const no = results[0];
+                // 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 {
+                // 基本的にありえないフロー
+                throw new factory.errors.ServiceUnavailable('Confirmation number not published');
+            }
         });
     }
 }

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

@@ -1,4 +1,4 @@
-import * as redis from 'redis';
+import { RedisClientType } from 'redis';
 import * as factory from '../../factory';
 export interface IOffer {
     itemOffered?: {
@@ -28,7 +28,7 @@ export interface IUnlockKey {
 export declare class RedisRepository {
     static KEY_PREFIX: string;
     private readonly redisClient;
-    constructor(redisClient: redis.RedisClient);
+    constructor(redisClient: RedisClientType);
     static OFFER2FIELD(params: IOffer): string;
     /**
      * 座席をロックする(maxキャパシティチェック有)
@@ -59,7 +59,7 @@ export declare class RedisRepository {
     /**
      * 保持者を取得する
      */
-    getHolder(params: IUnlockKey): Promise<string | null>;
+    getHolder(params: IUnlockKey): Promise<string | null | undefined>;
     /**
      * 在庫状況を検索する
      * offers.lengthが0だと"ERR wrong number of arguments for 'hmget' command"となるので注意