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

package/lib/chevre/repo/transactionNumber.js

@@ -30,58 +30,47 @@ 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:%s',
-                '%s:%s', RedisRepository.REDIS_KEY_PREFIX, 
-                // projectPrefix,
-                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 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}`;
-                            resolve({ transactionNumber });
-                        }
-                        else {
-                            // 基本的にありえないフロー
-                            reject(new factory.errors.ServiceUnavailable('Transaction number not published'));
-                        }
-                    }
-                });
-            });
+            // 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:%s',
+            '%s:%s', RedisRepository.REDIS_KEY_PREFIX, 
+            // projectPrefix,
+            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 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 };
+            }
+            else {
+                // 基本的にありえないフロー
+                throw new factory.errors.ServiceUnavailable('Transaction number not published');
+            }
         });
     }
 }

package/lib/chevre/service/task.d.ts

@@ -1,16 +1,16 @@
-import * as mongoose from 'mongoose';
-import * as redis from 'redis';
+import { Connection } from 'mongoose';
+import { RedisClientType } from 'redis';
 import * as factory from '../factory';
 import { MongoRepository as TaskRepo } from '../repo/task';
 export interface IConnectionSettings {
     /**
      * MongoDBコネクション
      */
-    connection: mongoose.Connection;
+    connection: Connection;
     /**
      * Redisクライアント
      */
-    redisClient?: redis.RedisClient;
+    redisClient?: RedisClientType;
 }
 export type TaskOperation<T> = (repos: {
     task: TaskRepo;

package/package.json

@@ -46,8 +46,6 @@
     "@types/node": "14.18.42",
     "@types/power-assert": "^1.5.3",
     "@types/pug": "^2.0.4",
-    "@types/redis": "^2.8.32",
-    "@types/redis-mock": "^0.17.0",
     "@types/request": "^2.48.5",
     "@types/request-promise-native": "^1.0.18",
     "@types/sinon": "^4.3.3",
@@ -64,8 +62,7 @@
     "nock": "^9.6.1",
     "nyc": "^15.1.0",
     "power-assert": "^1.6.1",
-    "redis": "^3.1.2",
-    "redis-mock": "^0.56.3",
+    "redis": "4.6.5",
     "request-promise-native": "^1.0.9",
     "rimraf": "^2.7.1",
     "sinon": "^4.5.0",
@@ -78,7 +75,7 @@
   "peerDependencies": {
     "aws-sdk": "^2.0.0",
     "mongoose": "^6.0.0",
-    "redis": "^3.1.2"
+    "redis": "^4.6.5"
   },
   "engines": {
     "node": ">=14.0.0",
@@ -120,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.0"
+  "version": "21.1.0-alpha.1"
 }

package/example/src/chevre/copyRedisKeys.ts

@@ -1,102 +0,0 @@
-// tslint:disable:no-console
-import * as redis from 'redis';
-// import * as mongoose from 'mongoose';
-
-// import { chevre } from '../../../lib/index';
-
-async function main() {
-
-    const client = redis.createClient({
-        host: process.env.REDIS_HOST,
-        port: Number(process.env.REDIS_PORT),
-        password: process.env.REDIS_KEY,
-        tls: { servername: process.env.REDIS_HOST }
-    });
-
-    const newClient = redis.createClient({
-        host: process.env.NEW_REDIS_HOST,
-        port: Number(process.env.NEW_REDIS_PORT),
-        password: process.env.NEW_REDIS_KEY
-    });
-
-    client.keys('chevre:itemAvailability:screeningEvent:*', async (err, keysreply) => {
-        console.log(err, keysreply.length, 'keys found');
-        const targetKeys = keysreply;
-
-        await Promise.all(targetKeys.map(async (targetKey) => {
-            const newKey = targetKey;
-
-            return new Promise<void>((resolve, reject) => {
-                client.hgetall(targetKey, (hgetallerr, reply) => {
-                    console.log('reply:', reply);
-                    if (hgetallerr !== null) {
-                        reject(hgetallerr);
-                    } else {
-                        if (reply !== null) {
-                            client.ttl(targetKey, (__, ttl) => {
-                                console.log('ttl:', ttl);
-                                const args = Object.keys(reply)
-                                    .reduce(
-                                        (a: any[], b) => {
-                                            return [...a, b, reply[b]];
-                                        },
-                                        []
-                                    );
-                                console.log(args.length, 'args ready');
-
-                                newClient.multi()
-                                    .hmset(newKey, ...args)
-                                    .expire(newKey, ttl)
-                                    .exec((hmsetErr, execreply) => {
-                                        console.log('hmset result:', hmsetErr, execreply);
-                                        resolve();
-                                    });
-                            });
-                        } else {
-                            reject(new Error('targetKey not found'));
-                        }
-                    }
-                });
-            });
-        }));
-    });
-
-    client.keys('chevre:reservationNumber:*', async (err, keysreply) => {
-        console.log(err, keysreply.length, 'keys found');
-        const targetKeys = keysreply;
-
-        await Promise.all(targetKeys.map(async (targetKey) => {
-            const newKey = targetKey;
-
-            return new Promise<void>((resolve, reject) => {
-                client.get(targetKey, (hgetallerr, reply) => {
-                    console.log('reply:', reply);
-                    if (hgetallerr !== null) {
-                        reject(hgetallerr);
-                    } else {
-                        if (reply !== null) {
-                            client.ttl(targetKey, (__, ttl) => {
-                                console.log('ttl:', ttl);
-                                const args = reply;
-
-                                newClient.multi()
-                                    .set(newKey, args)
-                                    .expire(newKey, ttl)
-                                    .exec((setErr, execreply) => {
-                                        console.log('set result:', setErr, execreply);
-                                        resolve();
-                                    });
-                            });
-                        } else {
-                            reject(new Error('targetKey not found'));
-                        }
-                    }
-                });
-            });
-        }));
-    });
-}
-
-main()
-    .then(console.log)
-    .catch(console.error);