@vasrefil/api-toolkit 1.10.5 → 1.11.0

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

@@ -15,9 +15,16 @@ declare class QueryHelper_ {
     }): {};
     get_filters(filter: any): any;
     process_filters: (query: any) => {} | undefined;
-    private get_search;
     private get_sort;
+    private get_limit;
+    private get_page;
+    private get_skip;
     private str_to_obj;
+    private get_range_filter;
+    private get_date_filter;
+    private get_filter;
+    private get_search;
+    private get_filter_result;
 }
 declare const QueryHelper: QueryHelper_;
 export { QueryHelper };

package/dist/helpers/query.helper.js

@@ -74,24 +74,12 @@ class QueryHelper_ {
     build_query(query) {
         if (!query)
             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) : {};
-        const date_rangex = date_range ? this.str_to_obj(date_range) : {};
-        const limitx = Number(limit) || 20;
-        const pagex = page ? Number(page) : 1;
-        const skip = page ? ((Number(pagex) - 1) * limitx) : 0;
-        if (range) {
-            const { field, ranges: { from, to } } = range;
-            range = { [field]: { $gte: from, $lt: to } };
-        }
-        const search = this.get_search(query);
-        const filterResult = range || filterx || {};
-        const date_range_ = this.get_date_range({ date_type, date_range: date_rangex });
-        const filters = this.process_filters(query);
+        const limit = this.get_limit(query);
+        const page = this.get_page(query);
+        const skip = this.get_skip(query);
         const sort = this.get_sort(query);
-        const filter_result = { ...filterResult, ...date_range_, ...search, ...filters };
-        return { sort, limit: limitx, filter: filter_result, skip, page: pagex };
+        const filter = this.get_filter_result(query);
+        return { sort, limit, filter, skip, page };
     }
     get_date_range(payload) {
         let date_filter_range = null;
@@ -156,7 +144,7 @@ class QueryHelper_ {
     get_sort(query) {
         try {
             const { key, value } = query.sort ? this.str_to_obj(query.sort) : {};
-            const single_sort = { [key || 'createdAt']: value || '-1' };
+            const single_sort = { [key || 'createdAt']: value || -1 };
             const sorts = query.sorts ? this.str_to_obj(query.sorts) : {};
             const sort = Object.values(sorts).length ? sorts : single_sort;
             return sort;
@@ -165,9 +153,58 @@ class QueryHelper_ {
             throw error;
         }
     }
+    get_limit(query) {
+        const limit = Number(query.limit) || 20;
+        return limit;
+    }
+    get_page(query) {
+        const page = Number(query.page) || 1;
+        return page;
+    }
+    get_skip(query) {
+        const limit = this.get_limit(query);
+        const page = this.get_page(query);
+        const skip = query.page ? ((Number(page) - 1) * limit) : 0;
+        return skip;
+    }
     str_to_obj(string) {
         return JSON.parse(string);
     }
+    // Filter Functions
+    get_range_filter(query) {
+        const { filter_range } = query;
+        let range = filter_range ? this.str_to_obj(filter_range) : null;
+        if (range) {
+            const { field, ranges: { from, to } } = range;
+            range = { [field]: { $gte: from, $lt: to } };
+        }
+        return range;
+    }
+    get_date_filter(query) {
+        const { date_type, date_range } = query;
+        const range = date_range ? this.str_to_obj(date_range) : {};
+        const result = this.get_date_range({ date_type, date_range: range });
+        return result;
+    }
+    get_filter(query) {
+        const filter = query.filter ? this.str_to_obj(query.filter) : {};
+        return filter;
+    }
+    get_filter_result(query) {
+        const filter = this.get_filter(query);
+        const date_filter = this.get_date_filter(query);
+        const range = this.get_range_filter(query);
+        const search = this.get_search(query);
+        const filters = this.process_filters(query);
+        const result = {
+            ...range,
+            ...filter,
+            ...date_filter,
+            ...search,
+            ...filters
+        };
+        return result;
+    }
 }
 const QueryHelper = new QueryHelper_;
 exports.QueryHelper = QueryHelper;

package/dist/utilities/api-request.util.d.ts

@@ -8,5 +8,9 @@ export interface ApiRequestPayloadI {
     headers?: any;
     apiKey?: string;
 }
+export declare const ApiRequest: (request: ApiRequestPayloadI, option: {
+    BASEURL: string;
+    API_KEY: string;
+}) => Promise<any>;
 export declare const VasrefilApiRequest: (request: ApiRequestPayloadI) => Promise<any>;
 export declare const LogApiRequest: (request: ApiRequestPayloadI) => Promise<any>;

package/dist/utilities/api-request.util.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LogApiRequest = exports.VasrefilApiRequest = void 0;
+exports.LogApiRequest = exports.VasrefilApiRequest = exports.ApiRequest = void 0;
 const axios_1 = __importDefault(require("axios"));
 const env_1 = __importDefault(require("../env"));
 const helpers_1 = require("../helpers");
@@ -25,11 +25,12 @@ const ApiRequest = async (request, option) => {
         throw error;
     }
 };
+exports.ApiRequest = ApiRequest;
 const VasrefilApiRequest = async (request) => {
     try {
         const API_KEY = env_1.default.VASREFIL.API_KEY;
         const BASEURL = env_1.default.VASREFIL.BASEURL;
-        const data = await ApiRequest(request, { BASEURL, API_KEY });
+        const data = await (0, exports.ApiRequest)(request, { BASEURL, API_KEY });
         return data;
     }
     catch (error) {
@@ -44,7 +45,7 @@ const LogApiRequest = async (request) => {
     try {
         const API_KEY = env_1.default.LOG.API_KEY;
         const BASEURL = env_1.default.LOG.BASEURL;
-        const data = await ApiRequest(request, { BASEURL, API_KEY });
+        const data = await (0, exports.ApiRequest)(request, { BASEURL, API_KEY });
         return data;
     }
     catch (error) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vasrefil/api-toolkit",
   "description": "This is Vasrefil API toolkit",
-  "version": "1.10.5",
+  "version": "1.11.0",
   "author": "Sodiq Alabi",
   "main": "dist/public-api.js",
   "types": "dist/public-api.d.ts",