@vasrefil/api-toolkit 1.0.52 → 1.0.54

package/dist/controllers/_root.control.js

@@ -40,7 +40,7 @@ class RootController {
             try {
                 const records = await this.fetchAll(conditon, query, select, populate);
                 const total_records = await this.getDocumentCount(conditon, query);
-                return { records, total_records };
+                return { total_records, records };
             }
             catch (error) {
                 throw error;

package/dist/helpers/query.helper.js

@@ -96,8 +96,14 @@ class QueryHelper_ {
         else if (date_type === 'this_year') {
             date_filter_range = date_util_1.DateUtil.this_year_date_range();
         }
-        else if (date_type === 'custom' && date_range && (date_range.start_date && date_range.end_date)) {
-            date_filter_range = date_util_1.DateUtil.get_custom_date_range(date_range);
+        else if (date_type === 'custom' && date_range && (date_range.start_date || date_range.end_date)) {
+            const d = date_util_1.DateUtil.get_custom_date_range(date_range);
+            const createdAt = {};
+            if (d.start_date)
+                createdAt['$gte'] = d.start_date;
+            if (d.end_date)
+                createdAt['$lt'] = d.end_date;
+            filter = { createdAt };
         }
         else if (date_type === 'last_30_days') {
             const d = date_util_1.DateUtil.get_date_range({ date: new Date(), number_of_days: 30 });

package/dist/services/sample.service.js

@@ -23,7 +23,7 @@ class SampleService extends _root_service_1.RootService {
         this.getAll = async (req, res) => {
             const actionType = 'GET_ALL_SAMPLES';
             try {
-                const samples = await sample_control_1.default.fetchAll({}, req.query);
+                const samples = await sample_control_1.default.fetchAllWithPagination({}, req.query);
                 this.sendResponse({ req, res, status: SUCCESS, actionType, data: samples });
             }
             catch (error) {

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

@@ -5,6 +5,7 @@ export interface ApiRequestPayloadI {
     url?: string;
     body?: any;
     params?: any;
+    headers?: any;
 }
 export declare const VasrefilApiRequest: (request: ApiRequestPayloadI) => Promise<any>;
 export declare const LogApiRequest: (request: ApiRequestPayloadI) => Promise<any>;

package/dist/utilities/date.util.d.ts

@@ -22,8 +22,8 @@ declare class DateUtil_ {
         start_date: Date;
         end_date: Date;
     }): {
-        start_date: Date;
-        end_date: Date;
+        start_date: Date | null;
+        end_date: Date | null;
     };
     this_week_date_range(): {
         start_date: Date;

package/dist/utilities/date.util.js

@@ -76,8 +76,8 @@ class DateUtil_ {
     }
     get_custom_date_range({ start_date, end_date }) {
         return {
-            start_date: dateFns.startOfDay(this.get_local_date(start_date)),
-            end_date: dateFns.endOfDay(this.get_local_date(end_date))
+            start_date: start_date ? dateFns.startOfDay(this.get_local_date(start_date)) : null,
+            end_date: end_date ? dateFns.endOfDay(this.get_local_date(end_date)) : null
         };
     }
     this_week_date_range() {

package/package.json

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