@rws-framework/db 2.2.6 → 2.2.8

package/dist/services/DBService.d.ts

@@ -1,4 +1,4 @@
-import { Collection } from 'mongodb';
+import { Collection, MongoClient } from 'mongodb';
 import { ITimeSeries } from '../types/ITimeSeries';
 import { IModel } from '../models/interfaces/IModel';
 import { IDbConfigHandler } from '../types/DbConfigHandler';
@@ -15,6 +15,7 @@ declare class DBService {
     constructor(configService: IDbConfigHandler);
     private connectToDB;
     reconnect(opts?: IDBClientCreate): void;
+    static baseClientConstruct(dbUrl: string): MongoClient;
     private createBaseMongoClient;
     private createBaseMongoClientDB;
     cloneDatabase(source: string, target: string): Promise<void>;

package/dist/services/DBService.js

@@ -45,10 +45,14 @@ class DBService {
     reconnect(opts = null) {
         this.connectToDB(opts);
     }
+    static baseClientConstruct(dbUrl) {
+        const client = new mongodb_1.MongoClient(dbUrl);
+        return client;
+    }
     async createBaseMongoClient() {
         var _a;
         const dbUrl = ((_a = this.opts) === null || _a === void 0 ? void 0 : _a.dbUrl) || this.configService.get('mongo_url');
-        const client = new mongodb_1.MongoClient(dbUrl);
+        const client = DBService.baseClientConstruct(dbUrl);
         await client.connect();
         return client;
     }
@@ -140,7 +144,7 @@ class DBService {
         }
         if (pagination) {
             const perPage = pagination.per_page || 50;
-            params.skip = pagination.page * perPage;
+            params.skip = (pagination.page || 0) * perPage;
             params.take = perPage;
         }
         const retData = await this.getCollectionHandler(collection).findMany(params);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@rws-framework/db",
   "private": false,
-  "version": "2.2.6",
+  "version": "2.2.8",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/services/DBService.ts

@@ -56,10 +56,17 @@ class DBService {
         this.connectToDB(opts);
     }
 
+    static baseClientConstruct(dbUrl: string): MongoClient
+    {        
+        const client = new MongoClient(dbUrl);
+
+        return client;
+    }
+
     private async createBaseMongoClient(): Promise<MongoClient>
     {
         const dbUrl = this.opts?.dbUrl || this.configService.get('mongo_url');
-        const client = new MongoClient(dbUrl);
+        const client = DBService.baseClientConstruct(dbUrl);
     
         await client.connect();
 
@@ -70,7 +77,7 @@ class DBService {
     private async createBaseMongoClientDB(): Promise<Db>
     {
         const dbName = this.opts?.dbName || this.configService.get('mongo_db');
-        const client = await this. createBaseMongoClient();
+        const client = await this.createBaseMongoClient();
         return client.db(dbName);
     }
 
@@ -197,7 +204,7 @@ class DBService {
 
         if(pagination){
             const perPage = pagination.per_page || 50;
-            params.skip = pagination.page * perPage;
+            params.skip = (pagination.page || 0) * perPage;
             params.take = perPage;
         }