@vasrefil/api-toolkit 1.0.51 → 1.0.53

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/env.d.ts

@@ -5,7 +5,7 @@ declare enum NODE_ENVS {
 }
 declare const env: {
     NODE_ENV: NODE_ENVS;
-    MONGODB_URI: string;
+    MONGODB_URI: string | undefined;
     API_KEY: string | undefined;
     SERVICE_NAME: string | undefined;
     REDIS_URL: string;

package/dist/env.js

@@ -11,7 +11,7 @@ var NODE_ENVS;
 let NODE_ENV = process.env.NODE_ENV;
 const env = {
     NODE_ENV,
-    MONGODB_URI: '',
+    MONGODB_URI: process.env.MONGODB_URI,
     API_KEY: process.env.API_KEY,
     SERVICE_NAME: process.env.SERVICE_NAME,
     REDIS_URL: process.env.REDIS_URL,

package/dist/helpers/query.helper.js

@@ -25,6 +25,14 @@ class QueryHelper_ {
                         else if (fit.operator === 'is_not') {
                             result.push({ [fit.field]: { $ne: fit.value } });
                         }
+                        else if (fit.operator === 'gte') {
+                            const value = isNaN(fit.value) ? fit.value : Number(fit.value);
+                            result.push({ [fit.field]: { $gte: value } });
+                        }
+                        else if (fit.operator === 'lte') {
+                            const value = isNaN(fit.value) ? fit.value : Number(fit.value);
+                            result.push({ [fit.field]: { $lte: value } });
+                        }
                     });
                     filter_query = { [logical_operator]: result };
                 }
@@ -88,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/models/sample.model.d.ts

@@ -2,6 +2,7 @@ import { Document, Model } from "mongoose";
 export interface ISample extends Document {
     name: string;
     description?: string;
+    number?: number;
 }
 export interface ISampleModel extends Model<ISample> {
 }

package/dist/models/sample.model.js

@@ -8,6 +8,9 @@ const schema = new mongoose_1.Schema({
     description: {
         type: String
     },
+    number: {
+        type: Number
+    },
 }, { timestamps: true });
 schema.index({});
 const SampleModel = (0, mongoose_1.model)('sample', schema);

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/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/dist/validations/sample.validator.js

@@ -38,7 +38,8 @@ class SampleValidator {
     constructor() {
         this.create = joi.object({
             name: joi.string().required(),
-            description: joi.string().required()
+            description: joi.string().required(),
+            number: joi.number().required(),
         });
     }
 }

package/package.json

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