@rws-framework/db 2.4.6 → 3.0.1

package/src/services/DBService.ts

@@ -1,277 +1,277 @@
-import { PrismaClient } from '@prisma/client';
-import { Collection, Db, MongoClient } from 'mongodb';
-import {ITimeSeries} from '../types/ITimeSeries';
-import { IModel } from '../models/interfaces/IModel';
-import chalk from 'chalk';
-import { IDbConfigHandler } from '../types/DbConfigHandler';
-import { IPaginationParams } from '../types/FindParams';
-
-interface IDBClientCreate {
-  dbUrl?: string;
-  dbName?: string;
-}
-
-class DBService {
-    private client: PrismaClient;
-    private opts: IDBClientCreate = null;
-    private connected = false;
-
-    constructor(private configService: IDbConfigHandler){}
-
-    private connectToDB(opts: IDBClientCreate = null) {
-        if(opts){
-            this.opts = opts;
-        }else{
-            this.opts = {
-                dbUrl: this.configService.get('db_url'),        
-                dbName: this.configService.get('db_name'),
-            };
-        }
-
-        if(!this.opts.dbUrl){
-            console.log(chalk.red('No database config set in @rws-framework/db'));
-
-            return;
-        }    
-  
-        try{
-            this.client = new PrismaClient({ 
-                datasources: {
-                    db: {
-                        url: this.opts.dbUrl
-                    },
-                },
-            });     
-
-            this.connected = true;
-        } catch (e: Error | any){                        
-            console.error(e);
-        
-            throw new Error('PRISMA CONNECTION ERROR');
-        }
-    }
-
-    reconnect(opts: IDBClientCreate = null)
-    {
-        this.connectToDB(opts);
-    }
-
-    static baseClientConstruct(dbUrl: string): MongoClient
-    {        
-        const client = new MongoClient(dbUrl);
-
-        return client;
-    }
-
-    public async createBaseMongoClient(): Promise<MongoClient>
-    {
-        const dbUrl = this.opts?.dbUrl || this.configService.get('db_url');
-        const client = DBService.baseClientConstruct(dbUrl);
-    
-        await client.connect();
-
-        return client;
-
-    }
-
-    public async createBaseMongoClientDB(): Promise<[MongoClient, Db]>
-    {
-        const dbName = this.opts?.dbName || this.configService.get('db_name');
-        const client = await this.createBaseMongoClient();
-        return [client, client.db(dbName)];
-    }
-
-    public async cloneDatabase(source: string, target: string): Promise<void> {
-        const client = await this.createBaseMongoClient();
-
-        // Source and target DB
-        const sourceDb = client.db(source);
-        const targetDb = client.db(target);
-
-        // Get all collections from source DB
-        const collections = await sourceDb.listCollections().toArray();
-
-        // Loop over all collections and copy them to the target DB
-        for (const collection of collections) {
-            const docs = await sourceDb.collection(collection.name).find({}).toArray();
-            await targetDb.collection(collection.name).insertMany(docs);
-        }
-
-        await client.close();
-    }
-
-    async watchCollection(collectionName: string, preRun: () => void): Promise<any>
-    {    
-        const [client, db] = await this.createBaseMongoClientDB();
-        const collection = db.collection(collectionName);
-
-        const changeStream = collection.watch();    
-        return new Promise((resolve) => {      
-            changeStream.on('change', (change) => {           
-                resolve(change);
-            });
-
-            preRun();
-        });   
-    }
-
-    async insert(data: any, collection: string, isTimeSeries: boolean = false) {
-    
-        let result: any = data;
-        // Insert time-series data outside of the transaction
-
-        if(isTimeSeries){
-            const [client, db] = await this.createBaseMongoClientDB();
-            const collectionHandler = db.collection(collection);
-      
-            const insert = await collectionHandler.insertOne(data);
-
-            result = await this.findOneBy(collection, { id: insert.insertedId.toString()  });
-            return result;
-        }
-
-        const prismaCollection = this.getCollectionHandler(collection);    
-
-        result = await prismaCollection.create({ data });
-
-        return await this.findOneBy(collection, { id: result.id });
-    }
-
-    async update(data: any, collection: string): Promise<IModel> 
-    {
-        const model_id: string = data.id;    
-        delete data['id'];
-
-        const prismaCollection = this.getCollectionHandler(collection);
-
-        await prismaCollection.update({
-            where: {
-                id: model_id,
-            },
-            data: data,
-        });    
-
-        
-        return await this.findOneBy(collection, { id: model_id });
-    }
-  
-
-    async findOneBy(collection: string, conditions: any, fields: string[] | null = null, ordering: { [fieldName: string]: string } = null, allowRelations: boolean = true): Promise<IModel|null>
-    {    
-        const params: any = { where: conditions };
-
-        if(fields){
-            params.select = {};
-            fields.forEach((fieldName: string) => {        
-                params.select[fieldName] = true;
-            });    
-        }
-
-        if(ordering){
-            params.orderBy = ordering;
-        }
-
-        const retData = await this.getCollectionHandler(collection).findFirst(params);
-
-        return retData;
-    }
-
-    async delete(collection: string, conditions: any): Promise<void>
-    {    
-        await this.getCollectionHandler(collection).deleteMany({ where: conditions });
-        return;
-    }
-
-    async findBy(
-        collection: string, 
-        conditions: any, 
-        fields: string[] | null = null, 
-        ordering: { [fieldName: string]: string } = null, 
-        pagination: IPaginationParams = null): Promise<IModel[]>
-    {    
-        const params: any ={ where: conditions };
-
-        if(fields){
-            params.select = {};
-            fields.forEach((fieldName: string) => {        
-                params.select[fieldName] = true;
-            });    
-        }
-
-        if(ordering){
-            params.orderBy = ordering;
-        }
-
-        if(pagination){
-            const perPage = pagination.per_page || 50;
-            params.skip = (pagination.page || 0) * perPage;
-            params.take = perPage;
-        }
-
-        const retData = await this.getCollectionHandler(collection).findMany(params);        
-
-        return retData;
-    }
-
-    async collectionExists(collection_name: string): Promise<boolean>
-    {
-        const dbUrl = this.opts?.dbUrl || this.configService.get('db_url');
-        const client = new MongoClient(dbUrl);
-
-        try {
-            await client.connect();    
-
-            const db = client.db(this.configService.get('db_name'));
-
-            const collections = await db.listCollections().toArray();
-            const existingCollectionNames = collections.map((collection) => collection.name);
-
-            return existingCollectionNames.includes(collection_name);
-        } catch (error) {
-            console.error('Error connecting to MongoDB:', error);
-
-            throw error;
-        }    
-    }
-
-    async createTimeSeriesCollection(collection_name: string): Promise<Collection<ITimeSeries>>
-    {    
-        try {    
-            const [client, db] = await this.createBaseMongoClientDB();
-
-            // Create a time series collection
-            const options = {
-                timeseries: {
-                    timeField: 'timestamp', // Replace with your timestamp field
-                    metaField: 'params' // Replace with your metadata field
-                }
-            };
-
-            await db.createCollection(collection_name, options); // Replace with your collection name
-
-            return db.collection(collection_name);
-
-        } catch (error) {
-            console.error('Error connecting to MongoDB:', error);
-
-            throw error;
-        }
-    }
-
-    private getCollectionHandler(collection: string): any 
-    {    
-        if(!this.client || !this.connected){
-            this.connectToDB();
-        }
-
-        return (this.client[collection as keyof PrismaClient] as any);
-    }
-
-    private setOpts(opts: IDBClientCreate = null): this
-    {    
-        this.opts = opts;
-        return this;
-    }
-}
-
-export { DBService, IDBClientCreate };
+import { PrismaClient } from '@prisma/client';
+import { Collection, Db, MongoClient } from 'mongodb';
+import {ITimeSeries} from '../types/ITimeSeries';
+import { IModel } from '../models/interfaces/IModel';
+import chalk from 'chalk';
+import { IDbConfigHandler } from '../types/DbConfigHandler';
+import { IPaginationParams } from '../types/FindParams';
+
+interface IDBClientCreate {
+  dbUrl?: string;
+  dbName?: string;
+}
+
+class DBService {
+    private client: PrismaClient;
+    private opts: IDBClientCreate = null;
+    private connected = false;
+
+    constructor(private configService: IDbConfigHandler){}
+
+    private connectToDB(opts: IDBClientCreate = null) {
+        if(opts){
+            this.opts = opts;
+        }else{
+            this.opts = {
+                dbUrl: this.configService.get('db_url'),        
+                dbName: this.configService.get('db_name'),
+            };
+        }
+
+        if(!this.opts.dbUrl){
+            console.log(chalk.red('No database config set in @rws-framework/db'));
+
+            return;
+        }    
+  
+        try{
+            this.client = new PrismaClient({ 
+                datasources: {
+                    db: {
+                        url: this.opts.dbUrl
+                    },
+                },
+            });     
+
+            this.connected = true;
+        } catch (e: Error | any){                        
+            console.error(e);
+        
+            throw new Error('PRISMA CONNECTION ERROR');
+        }
+    }
+
+    reconnect(opts: IDBClientCreate = null)
+    {
+        this.connectToDB(opts);
+    }
+
+    static baseClientConstruct(dbUrl: string): MongoClient
+    {        
+        const client = new MongoClient(dbUrl);
+
+        return client;
+    }
+
+    public async createBaseMongoClient(): Promise<MongoClient>
+    {
+        const dbUrl = this.opts?.dbUrl || this.configService.get('db_url');
+        const client = DBService.baseClientConstruct(dbUrl);
+    
+        await client.connect();
+
+        return client;
+
+    }
+
+    public async createBaseMongoClientDB(): Promise<[MongoClient, Db]>
+    {
+        const dbName = this.opts?.dbName || this.configService.get('db_name');
+        const client = await this.createBaseMongoClient();
+        return [client, client.db(dbName)];
+    }
+
+    public async cloneDatabase(source: string, target: string): Promise<void> {
+        const client = await this.createBaseMongoClient();
+
+        // Source and target DB
+        const sourceDb = client.db(source);
+        const targetDb = client.db(target);
+
+        // Get all collections from source DB
+        const collections = await sourceDb.listCollections().toArray();
+
+        // Loop over all collections and copy them to the target DB
+        for (const collection of collections) {
+            const docs = await sourceDb.collection(collection.name).find({}).toArray();
+            await targetDb.collection(collection.name).insertMany(docs);
+        }
+
+        await client.close();
+    }
+
+    async watchCollection(collectionName: string, preRun: () => void): Promise<any>
+    {    
+        const [client, db] = await this.createBaseMongoClientDB();
+        const collection = db.collection(collectionName);
+
+        const changeStream = collection.watch();    
+        return new Promise((resolve) => {      
+            changeStream.on('change', (change) => {           
+                resolve(change);
+            });
+
+            preRun();
+        });   
+    }
+
+    async insert(data: any, collection: string, isTimeSeries: boolean = false) {
+    
+        let result: any = data;
+        // Insert time-series data outside of the transaction
+
+        if(isTimeSeries){
+            const [client, db] = await this.createBaseMongoClientDB();
+            const collectionHandler = db.collection(collection);
+      
+            const insert = await collectionHandler.insertOne(data);
+
+            result = await this.findOneBy(collection, { id: insert.insertedId.toString()  });
+            return result;
+        }
+
+        const prismaCollection = this.getCollectionHandler(collection);    
+
+        result = await prismaCollection.create({ data });
+
+        return await this.findOneBy(collection, { id: result.id });
+    }
+
+    async update(data: any, collection: string): Promise<IModel> 
+    {
+        const model_id: string = data.id;    
+        delete data['id'];
+
+        const prismaCollection = this.getCollectionHandler(collection);
+
+        await prismaCollection.update({
+            where: {
+                id: model_id,
+            },
+            data: data,
+        });    
+
+        
+        return await this.findOneBy(collection, { id: model_id });
+    }
+  
+
+    async findOneBy(collection: string, conditions: any, fields: string[] | null = null, ordering: { [fieldName: string]: string } = null, allowRelations: boolean = true): Promise<IModel|null>
+    {    
+        const params: any = { where: conditions };
+
+        if(fields){
+            params.select = {};
+            fields.forEach((fieldName: string) => {        
+                params.select[fieldName] = true;
+            });    
+        }
+
+        if(ordering){
+            params.orderBy = ordering;
+        }
+
+        const retData = await this.getCollectionHandler(collection).findFirst(params);
+
+        return retData;
+    }
+
+    async delete(collection: string, conditions: any): Promise<void>
+    {    
+        await this.getCollectionHandler(collection).deleteMany({ where: conditions });
+        return;
+    }
+
+    async findBy(
+        collection: string, 
+        conditions: any, 
+        fields: string[] | null = null, 
+        ordering: { [fieldName: string]: string } = null, 
+        pagination: IPaginationParams = null): Promise<IModel[]>
+    {    
+        const params: any ={ where: conditions };
+
+        if(fields){
+            params.select = {};
+            fields.forEach((fieldName: string) => {        
+                params.select[fieldName] = true;
+            });    
+        }
+
+        if(ordering){
+            params.orderBy = ordering;
+        }
+
+        if(pagination){
+            const perPage = pagination.per_page || 50;
+            params.skip = (pagination.page || 0) * perPage;
+            params.take = perPage;
+        }
+
+        const retData = await this.getCollectionHandler(collection).findMany(params);        
+
+        return retData;
+    }
+
+    async collectionExists(collection_name: string): Promise<boolean>
+    {
+        const dbUrl = this.opts?.dbUrl || this.configService.get('db_url');
+        const client = new MongoClient(dbUrl);
+
+        try {
+            await client.connect();    
+
+            const db = client.db(this.configService.get('db_name'));
+
+            const collections = await db.listCollections().toArray();
+            const existingCollectionNames = collections.map((collection) => collection.name);
+
+            return existingCollectionNames.includes(collection_name);
+        } catch (error) {
+            console.error('Error connecting to MongoDB:', error);
+
+            throw error;
+        }    
+    }
+
+    async createTimeSeriesCollection(collection_name: string): Promise<Collection<ITimeSeries>>
+    {    
+        try {    
+            const [client, db] = await this.createBaseMongoClientDB();
+
+            // Create a time series collection
+            const options = {
+                timeseries: {
+                    timeField: 'timestamp', // Replace with your timestamp field
+                    metaField: 'params' // Replace with your metadata field
+                }
+            };
+
+            await db.createCollection(collection_name, options); // Replace with your collection name
+
+            return db.collection(collection_name);
+
+        } catch (error) {
+            console.error('Error connecting to MongoDB:', error);
+
+            throw error;
+        }
+    }
+
+    private getCollectionHandler(collection: string): any 
+    {    
+        if(!this.client || !this.connected){
+            this.connectToDB();
+        }
+
+        return (this.client[collection as keyof PrismaClient] as any);
+    }
+
+    private setOpts(opts: IDBClientCreate = null): this
+    {    
+        this.opts = opts;
+        return this;
+    }
+}
+
+export { DBService, IDBClientCreate };

package/src/types/DbConfigHandler.ts

@@ -1,17 +1,17 @@
-import { OpModelType } from "../models/interfaces/OpModelType";
-
-export interface IDbConfigParams {
-    db_url?: string;
-    db_name?: string;
-    db_type?: 'mongodb' | 'mysql' | 'sqlite';
-    db_models?: OpModelType<any>[]
-}
-
-export interface IdGeneratorOptions {
-    useUuid?: boolean;  // dla MySQL
-    customType?: string;  // dla custom typów
-}
-
-export interface IDbConfigHandler {
-    get<K extends keyof IDbConfigParams>(key: K): IDbConfigParams[K];
-}
+import { OpModelType } from "../models/interfaces/OpModelType";
+
+export interface IDbConfigParams {
+    db_url?: string;
+    db_name?: string;
+    db_type?: 'mongodb' | 'mysql' | 'sqlite' | 'postgresql' | 'postgres';
+    db_models?: OpModelType<any>[]
+}
+
+export interface IdGeneratorOptions {
+    useUuid?: boolean;  // dla MySQL
+    customType?: string;  // dla custom typów
+}
+
+export interface IDbConfigHandler {
+    get<K extends keyof IDbConfigParams>(key: K): IDbConfigParams[K];
+}

package/src/types/FindParams.ts

@@ -1,13 +1,13 @@
-export type FindByType = {
-    conditions?: any  
-    ordering?: { [fieldName: string]: string }
-    fields?: string[]
-    allowRelations?: boolean
-    fullData?: boolean
-    pagination?: IPaginationParams
-}
-
-export interface IPaginationParams {
-    page: number,
-    per_page?: number
-}
+export type FindByType = {
+    conditions?: any  
+    ordering?: { [fieldName: string]: string }
+    fields?: string[]
+    allowRelations?: boolean
+    fullData?: boolean
+    pagination?: IPaginationParams
+}
+
+export interface IPaginationParams {
+    page: number,
+    per_page?: number
+}

package/src/types/IRWSModel.ts

@@ -1,3 +1,3 @@
-export interface IRWSModel {
-    id?: string
+export interface IRWSModel {
+    id?: string | number
 }

package/src/types/ITimeSeries.ts

@@ -1,6 +1,6 @@
-export interface ITimeSeries {  
-    value: number,  
-    timestamp?: Date;
-    params?: any;
-    time_tracker_id?: string
+export interface ITimeSeries {  
+    value: number,  
+    timestamp?: Date;
+    params?: any;
+    time_tracker_id?: string
 }