@vasrefil/api-toolkit 1.0.28 → 1.0.30

package/dist/env.d.ts

@@ -8,6 +8,7 @@ declare const env: {
     MONGODB_URI: string;
     API_KEY: string | undefined;
     SERVICE_NAME: string | undefined;
+    REDIS_URL: string;
     VASREFIL: {
         BASEURL: string;
         API_KEY: string | undefined;

package/dist/env.js

@@ -14,6 +14,7 @@ const env = {
     MONGODB_URI: '',
     API_KEY: process.env.API_KEY,
     SERVICE_NAME: process.env.SERVICE_NAME,
+    REDIS_URL: process.env.REDIS_URL,
     VASREFIL: {
         BASEURL: NODE_ENV === NODE_ENVS.PROD ? 'https://api.vasrefil.com' : 'https://api-v2-test.vasrefil.com',
         API_KEY: process.env.VASREFIL_API_KEY

package/dist/helpers/query.helper.d.ts

@@ -15,6 +15,7 @@ declare class QueryHelper_ {
     }): {};
     get_filters(filter: any): any;
     process_filters: (query: any) => {} | undefined;
+    private get_search;
     private get_sort;
     private str_to_obj;
 }

package/dist/helpers/query.helper.js

@@ -34,14 +34,28 @@ class QueryHelper_ {
                 console.log(error);
             }
         };
+        this.get_search = (query) => {
+            const { search } = query;
+            let searchx = search ? this.str_to_obj(search) : {};
+            let result = {};
+            if (searchx.key && searchx.value) {
+                const keys = searchx.key.split(',');
+                const filters = [];
+                for (let key of keys) {
+                    key = key.trim();
+                    filters.push({ [key]: { $regex: new RegExp(`${searchx.value}`, 'i') } });
+                }
+                result = { '$or': filters };
+            }
+            return result;
+        };
     }
     build_query(query) {
         if (!query)
             query = {};
-        const { filter, limit, page, filterRange, date_range, date_type, search } = query;
+        const { filter, limit, page, filterRange, date_range, date_type } = query;
         let range = filterRange ? this.str_to_obj(filterRange) : null;
         const filterx = filter ? this.str_to_obj(filter) : {};
-        let searchx = search ? this.str_to_obj(search) : {};
         const date_rangex = date_range ? this.str_to_obj(date_range) : {};
         const pagex = page ? Number(page) : 1;
         const skipx = page ? ((Number(page) - 1) * limit) : 0;
@@ -50,13 +64,12 @@ class QueryHelper_ {
             const { field, ranges: { from, to } } = range;
             range = { [field]: { $gte: from, $lt: to } };
         }
-        searchx = searchx.key && searchx.value ? searchx : null;
+        const search = this.get_search(query);
         const filterResult = range || filterx || {};
         const date_range_ = this.get_date_range({ date_type, date_range: date_rangex });
-        const search_ = searchx ? { [searchx.key]: { $regex: new RegExp(`${searchx.value}`, 'i') } } : {};
         const filters = this.process_filters(query);
         const sort = this.get_sort(query);
-        const filter_result = { ...filterResult, ...date_range_, ...search_, ...filters };
+        const filter_result = { ...filterResult, ...date_range_, ...search, ...filters };
         return { sort, limit: limitx, filter: filter_result, skip: skipx, page: pagex };
     }
     get_date_range(payload) {

package/dist/index.js

@@ -12,7 +12,7 @@ const _config_1 = require("./models/_config");
 const index_route_1 = require("./routes/index.route");
 const logger_util_1 = require("./utilities/logger.util");
 // import { airbrake, airbrakeExpress } from './app-middlewares/airbrake';
-const port = process.env.PORT || 8082;
+const port = process.env.PORT || 8012;
 const app = (0, express_1.default)();
 //configure application
 app.use(express_1.default.static(path_1.default.join(__dirname, "public")));

package/dist/interfaces/user.interface.d.ts

@@ -4,44 +4,8 @@ export interface UserI {
     first_name: string;
     last_name: string;
     middle_name: string;
-    email: string;
-    email_verified: boolean;
-    email_verification_code: string;
     user_name: string;
-    password: string;
-    balance: number;
-    level: number;
-    phone: string;
-    signup_code: string;
-    pin?: string;
-    password_reset_code?: string;
-    pin_reset_code?: string;
-    profile_image_url?: string;
-    referrer_commission?: string;
-    device_unique_id?: string;
-    is_active?: boolean;
-    is_deleted?: boolean;
-    delete_account_code?: string;
-    pin_is_set?: boolean;
-    date_of_birth?: Date;
-    gender: 'Male' | 'Female';
-    bvn?: string;
-    bvn_hash?: string;
-    nin?: string;
-    nin_hash?: string;
-    bvn_phone?: string;
-    marketing_channel?: string;
-    onesignal_player_id_is_set?: boolean;
-    vas_service_fee?: number;
-    api_key: string;
-    bvn_verification_code?: string;
-    whatsapp_number?: string;
-    address_info: {
-        address: string;
-        city: string;
-        state: string;
-    };
-    can_use_voucher?: boolean;
+    email: string;
     createdAt?: Date;
 }
 export interface UserWalletOperationI {

package/dist/public-api.d.ts

@@ -5,3 +5,4 @@ export * from './app-middlewares';
 export * from './interfaces';
 export * from './middlewares';
 export * from './services';
+export * from './redis';

package/dist/public-api.js

@@ -21,3 +21,4 @@ __exportStar(require("./app-middlewares"), exports);
 __exportStar(require("./interfaces"), exports);
 __exportStar(require("./middlewares"), exports);
 __exportStar(require("./services"), exports);
+__exportStar(require("./redis"), exports);

package/dist/redis/index.d.ts

@@ -0,0 +1 @@
+export * from './redis';

package/dist/redis/index.js

@@ -0,0 +1,17 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./redis"), exports);

package/dist/redis/redis.d.ts

@@ -0,0 +1,40 @@
+declare class Redis_ {
+    private client;
+    private className;
+    init: () => Promise<void>;
+    exists: (key: string) => Promise<number>;
+    set_multiple_hash: (key: string, pairs: any) => Promise<"OK">;
+    set_hash: (payload: {
+        key: string;
+        field: string;
+        value: any;
+    }) => Promise<number>;
+    get_hash: (payload: {
+        key: string;
+        field: string;
+    }) => Promise<string | null>;
+    delete_hash: (payload: {
+        key: string;
+        field: string;
+    }) => Promise<number>;
+    fetch_hashes: (key: string) => Promise<Record<string, string>>;
+    set_item: (payload: {
+        key: string;
+        value: any;
+    }) => Promise<"OK">;
+    get_item: (key: string) => Promise<any>;
+    expire: (dto: {
+        key: string;
+        expireIn: number | string;
+    }) => Promise<number>;
+    set_list: (payload: {
+        key: string;
+        values: any[];
+    }) => Promise<number>;
+    get_list: (payload: {
+        key: string;
+    }) => Promise<string[]>;
+    private is_valid_json;
+}
+declare const Redis: Redis_;
+export { Redis };

package/dist/redis/redis.js

@@ -0,0 +1,155 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Redis = void 0;
+const ioredis_1 = __importDefault(require("ioredis"));
+const env_1 = __importDefault(require("../env"));
+class Redis_ {
+    constructor() {
+        this.className = 'Redis';
+        this.init = async () => {
+            this.client = new ioredis_1.default(env_1.default.REDIS_URL);
+            this.client.on('error', (err) => console.log('Redis Client Error', err));
+            this.client.on('connect', () => console.log('Redis server connected...'));
+        };
+        // new_client(option?: object) {
+        //     return new IORedis(env.REDIS_URL, option);
+        // }
+        this.exists = async (key) => {
+            try {
+                const resp = await this.client.exists(key);
+                return resp;
+            }
+            catch (error) {
+                console.log(`[${this.className}-EXISTS]`, error);
+                throw error;
+            }
+        };
+        this.set_multiple_hash = async (key, pairs) => {
+            try {
+                const resp = await this.client.hmset(key, pairs);
+                return resp;
+            }
+            catch (error) {
+                console.log(`[${this.className}-SET_MULTIPLE_HASH]`, error);
+                throw error;
+            }
+        };
+        this.set_hash = async (payload) => {
+            try {
+                const { key, field, value } = payload;
+                const value_ = value ? JSON.stringify(value) : value;
+                const resp = await this.client.hset(key, field, value_);
+                return resp;
+            }
+            catch (error) {
+                console.log(`[${this.className}-SET_HASH]`, error);
+                throw error;
+            }
+        };
+        this.get_hash = async (payload) => {
+            try {
+                const { key, field } = payload;
+                let resp = await this.client.hget(key, `${field}`);
+                resp = resp ? JSON.parse(resp) : resp;
+                return resp;
+            }
+            catch (error) {
+                console.log(`[${this.className}-GET_HASH]`, error);
+                throw error;
+            }
+        };
+        this.delete_hash = async (payload) => {
+            try {
+                const { key, field } = payload;
+                let resp = await this.client.hdel(key, `${field}`);
+                resp = resp ? JSON.parse(`${resp}`) : resp;
+                return resp;
+            }
+            catch (error) {
+                console.log(`[${this.className}-DELETE_HASH]`, error);
+                throw error;
+            }
+        };
+        this.fetch_hashes = async (key) => {
+            try {
+                const resp = await this.client.hgetall(key);
+                return resp;
+            }
+            catch (error) {
+                console.log(`[${this.className}-GET_ALL_HASH]`, error);
+                throw error;
+            }
+        };
+        this.set_item = async (payload) => {
+            try {
+                const { key, value } = payload;
+                const resp = await this.client.set(key, JSON.stringify(value));
+                return resp;
+            }
+            catch (error) {
+                console.log(`[${this.className}-SET_ITEM]`, error);
+                throw error;
+            }
+        };
+        this.get_item = async (key) => {
+            try {
+                const resp = await this.client.get(key);
+                if (this.is_valid_json(resp)) {
+                    return JSON.parse(resp);
+                }
+                else {
+                    return resp;
+                }
+            }
+            catch (error) {
+                console.log(`[${this.className}-GET_ITEM]`, error);
+                throw error;
+            }
+        };
+        this.expire = async (dto) => {
+            try {
+                const resp = await this.client.expire(dto.key, dto.expireIn);
+                return resp;
+            }
+            catch (error) {
+                throw error;
+            }
+        };
+        this.set_list = async (payload) => {
+            try {
+                const { key, values } = payload;
+                const resp = await this.client.lpush(key, values);
+                return resp;
+            }
+            catch (error) {
+                console.log(`[${this.className}-SET_LIST]`, error);
+                throw error;
+            }
+        };
+        this.get_list = async (payload) => {
+            try {
+                const { key } = payload;
+                const resp = await this.client.lrange(key, 0, -1);
+                return resp;
+            }
+            catch (error) {
+                console.log(`[${this.className}-GET_LIST]`, error);
+                throw error;
+            }
+        };
+    }
+    is_valid_json(str) {
+        try {
+            JSON.parse(str);
+            return true;
+        }
+        catch (e) {
+            return false;
+        }
+    }
+}
+const Redis = new Redis_;
+exports.Redis = Redis;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vasrefil/api-toolkit",
   "description": "This is Vasrefil API toolkit",
-  "version": "1.0.28",
+  "version": "1.0.30",
   "author": "Sodiq Alabi",
   "main": "dist/public-api.js",
   "types": "dist/public-api.d.ts",
@@ -28,6 +28,7 @@
     "errorhandler": "^1.5.1",
     "express": "^4.18.3",
     "helmet": "^4.2.0",
+    "ioredis": "^5.4.1",
     "joi": "^17.3.0",
     "json-stringify-safe": "^5.0.1",
     "mongoose": "^6.0.14",