@rws-framework/db 3.3.8 → 3.5.0

package/src/models/core/TimeSeriesModel.ts

@@ -1,19 +1,19 @@
-import { RWSModel } from './RWSModel';
-import { TrackType } from '../../decorators';
-
-// export default class TimeSeriesModel<T> extends RWSModel<T> {
-//     @TrackType(Number) value: number;
-
-//     @TrackType(Date) timestamp: Date;
-    
-//     @TrackType(Object)
-//     params: any;
-
-//     constructor(data?: any) {    
-//         super(data);
-
-//         if(!this.timestamp) {
-//             this.timestamp = new Date();
-//         }
-//     }
-// }
+import { RWSModel } from './RWSModel';
+import { TrackType } from '../../decorators';
+
+// export default class TimeSeriesModel<T> extends RWSModel<T> {
+//     @TrackType(Number) value: number;
+
+//     @TrackType(Date) timestamp: Date;
+    
+//     @TrackType(Object)
+//     params: any;
+
+//     constructor(data?: any) {    
+//         super(data);
+
+//         if(!this.timestamp) {
+//             this.timestamp = new Date();
+//         }
+//     }
+// }

package/src/models/interfaces/IModel.ts

@@ -1,12 +1,12 @@
-import { IDbConfigHandler } from '../../types/DbConfigHandler';
-import { DBService } from '../../services/DBService';
-
-export interface IModel {
-    [key: string]: any;
-    id: string |number | null;
-    save: () => void;
-    getDb: () => DBService;
-    getCollection: () => string | null;
-    configService?: IDbConfigHandler;
-    dbService?: DBService;
-}
+import { IDbConfigHandler } from '../../types/DbConfigHandler';
+import { DBService } from '../../services/DBService';
+
+export interface IModel {
+    [key: string]: any;
+    id: string |number | null;
+    save: () => void;
+    getDb: () => DBService;
+    getCollection: () => string | null;
+    configService?: IDbConfigHandler;
+    dbService?: DBService;
+}

package/src/models/interfaces/IRWSModelServices.ts

@@ -1,7 +1,7 @@
-import { IDbConfigHandler } from '../../types/DbConfigHandler';
-import { DBService } from '../../services/DBService';
-
-export interface IRWSModelServices {
-    configService?: IDbConfigHandler;
-    dbService?: DBService;
-}
+import { IDbConfigHandler } from '../../types/DbConfigHandler';
+import { DBService } from '../../services/DBService';
+
+export interface IRWSModelServices {
+    configService?: IDbConfigHandler;
+    dbService?: DBService;
+}

package/src/models/utils/PaginationUtils.ts

@@ -1,42 +1,42 @@
-import { RelOneMetaType, RelManyMetaType } from '../types/RelationTypes';
-import { IRWSModel } from '../../types/IRWSModel';
-import { OpModelType, RWSModel } from '../_model';
-import { FindByType, IPaginationParams } from '../../types/FindParams';
-
-export class PaginationUtils {
-
-    public static async paginate<T extends RWSModel<T>>(
-            this: OpModelType<T>,             
-            paginationParams: IPaginationParams = { page: 0, per_page: 50 },
-            findParams: FindByType = {},
-        ): Promise<T[]> {
-        const conditions = findParams?.conditions ?? {};
-        const ordering = findParams?.ordering ?? null;
-        const fields = findParams?.fields ?? null;
-        const allowRelations = findParams?.allowRelations ?? true;
-        const fullData = findParams?.fullData ?? false;
-
-        const collection = Reflect.get(this, '_collection');
-        this.checkForInclusionWithThrow(this.name);
-        try {
-            const dbData = await this.services.dbService.findBy(collection, conditions, fields, ordering, paginationParams);   
-            if (dbData.length) {
-                const instanced: T[] = [];
-        
-                for (const data of dbData) { 
-                    const inst: T = new (this as { new(): T })();
-                    instanced.push((await inst._asyncFill(data, fullData,allowRelations)) as T);
-                }
-        
-                return instanced;
-            }
-        
-            return [];
-        } catch (rwsError: Error | any) {
-            console.error(rwsError);
-
-            throw rwsError;
-        }          
-    }
-    
-}
+import { RelOneMetaType, RelManyMetaType } from '../types/RelationTypes';
+import { IRWSModel } from '../../types/IRWSModel';
+import { OpModelType, RWSModel } from '../_model';
+import { FindByType, IPaginationParams } from '../../types/FindParams';
+
+export class PaginationUtils {
+
+    public static async paginate<T extends RWSModel<T>>(
+            this: OpModelType<T>,             
+            paginationParams: IPaginationParams = { page: 0, per_page: 50 },
+            findParams: FindByType = {},
+        ): Promise<T[]> {
+        const conditions = findParams?.conditions ?? {};
+        const ordering = findParams?.ordering ?? null;
+        const fields = findParams?.fields ?? null;
+        const allowRelations = findParams?.allowRelations ?? true;
+        const fullData = findParams?.fullData ?? false;
+
+        const collection = Reflect.get(this, '_collection');
+        this.checkForInclusionWithThrow(this.name);
+        try {
+            const dbData = await this.services.dbService.findBy(collection, conditions, fields, ordering, paginationParams);   
+            if (dbData.length) {
+                const instanced: T[] = [];
+        
+                for (const data of dbData) { 
+                    const inst: T = new (this as { new(): T })();
+                    instanced.push((await inst._asyncFill(data, fullData,allowRelations)) as T);
+                }
+        
+                return instanced;
+            }
+        
+            return [];
+        } catch (rwsError: Error | any) {
+            console.error(rwsError);
+
+            throw rwsError;
+        }          
+    }
+    
+}

package/src/models/utils/TimeSeriesUtils.ts

@@ -1,38 +1,38 @@
-import { RWSModel } from "../_model";
-
-export class TimeSeriesUtils {
-    static getTimeSeriesModelFields(model: RWSModel<any>): {[key: string]: {collection: string, hydrationField: string, ids: string[]}} {
-        const timeSeriesIds: {[key: string]: {collection: string, hydrationField: string, ids: string[]}} = {};
-
-        for (const key in model) {
-            if (model.hasOwnProperty(key)) {             
-                const meta = Reflect.getMetadata(`InverseTimeSeries:${key}`, model);            
-                if(meta){
-                    if(!timeSeriesIds[key]){
-                        timeSeriesIds[key] = {
-                            collection: meta.timeSeriesModel,
-                            hydrationField: meta.hydrationField,
-                            ids: model[key]
-                        };
-                    }
-                }                         
-            }
-        } 
-
-        return timeSeriesIds;
-    }
-
-    static checkTimeSeries(constructor: any): boolean {            
-        const data = constructor.prototype as any;
-
-        for (const key in data) {
-            if (data.hasOwnProperty(key)) {   
-                if(Reflect.getMetadata(`InverseTimeSeries:${key}`, constructor.prototype)){
-                    return true;
-                }
-            }
-        }
-
-        return false;
-    }
-}
+import { RWSModel } from "../_model";
+
+export class TimeSeriesUtils {
+    static getTimeSeriesModelFields(model: RWSModel<any>): {[key: string]: {collection: string, hydrationField: string, ids: string[]}} {
+        const timeSeriesIds: {[key: string]: {collection: string, hydrationField: string, ids: string[]}} = {};
+
+        for (const key in model) {
+            if (model.hasOwnProperty(key)) {             
+                const meta = Reflect.getMetadata(`InverseTimeSeries:${key}`, model);            
+                if(meta){
+                    if(!timeSeriesIds[key]){
+                        timeSeriesIds[key] = {
+                            collection: meta.timeSeriesModel,
+                            hydrationField: meta.hydrationField,
+                            ids: model[key]
+                        };
+                    }
+                }                         
+            }
+        } 
+
+        return timeSeriesIds;
+    }
+
+    static checkTimeSeries(constructor: any): boolean {            
+        const data = constructor.prototype as any;
+
+        for (const key in data) {
+            if (data.hasOwnProperty(key)) {   
+                if(Reflect.getMetadata(`InverseTimeSeries:${key}`, constructor.prototype)){
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+}

package/src/services/DBService.ts

@@ -5,6 +5,7 @@ import { IModel } from '../models/interfaces/IModel';
 import chalk from 'chalk';
 import { IDbConfigHandler } from '../types/DbConfigHandler';
 import { IPaginationParams } from '../types/FindParams';
+import { OpModelType } from '../models/interfaces/OpModelType';
 
 interface IDBClientCreate {
   dbUrl?: string;
@@ -287,6 +288,10 @@ class DBService {
         this.opts = opts;
         return this;
     }
+
+    public async count<T = any>(opModel: OpModelType<T>, where: {[k: string]: any} = {}): Promise<number>{
+        return await this.getCollectionHandler(opModel._collection).count(where);
+    }
 }
 
 export { DBService, IDBClientCreate };

package/src/types/DbConfigHandler.ts

@@ -4,7 +4,9 @@ export interface IDbConfigParams {
     db_url?: string;
     db_name?: string;
     db_type?: 'mongodb' | 'mysql' | 'sqlite' | 'postgresql' | 'postgres';
-    db_models?: OpModelType<any>[]
+    db_models?: OpModelType<any>[],
+    db_prisma_output?: string,
+    db_prisma_binary_targets?: string[]
 }
 
 export interface IdGeneratorOptions {

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/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
 }