@webtypen/webframez-core 0.0.21 → 0.0.22

package/lib/Database/Model.d.ts

@@ -15,6 +15,32 @@ export declare class Model {
      * @returns QueryBulder
      */
     static where(column: any, operator: any, value: any): QueryBuilder;
+    /**
+     * Creates a new query-builder object and adds a orderBy-clause
+     * @param column
+     * @param sort
+     * @returns QueryBulder
+     */
+    static orderBy(column: any, sort: any): QueryBuilder;
+    /**
+     * Creates a new query-builder object and executes first()
+     * @param options?
+     * @returns QueryBulder
+     */
+    static first(options?: any): Promise<any>;
+    /**
+     * Creates a new query-builder object and executes get()
+     * @param options?
+     * @returns QueryBulder
+     */
+    static get(options?: any): Promise<any>;
+    /**
+     * Creates a new query-builder object and executes paginate()
+     * @param count
+     * @param options?
+     * @returns QueryBulder
+     */
+    static paginate(count: number, options?: any): Promise<any>;
     /**
      * Executes a database-aggregation (mostly used by no-sql connections)
      * @param aggregation

package/lib/Database/Model.js

@@ -44,6 +44,63 @@ class Model {
         queryBuilder.where(column, operator, value);
         return queryBuilder;
     }
+    /**
+     * Creates a new query-builder object and adds a orderBy-clause
+     * @param column
+     * @param sort
+     * @returns QueryBulder
+     */
+    static orderBy(column, sort) {
+        const model = new this();
+        const queryBuilder = new QueryBuilder_1.QueryBuilder();
+        queryBuilder.setModelMapping(this);
+        queryBuilder.table(model.__table);
+        queryBuilder.orderBy(column, sort);
+        return queryBuilder;
+    }
+    /**
+     * Creates a new query-builder object and executes first()
+     * @param options?
+     * @returns QueryBulder
+     */
+    static first(options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const model = new this();
+            const queryBuilder = new QueryBuilder_1.QueryBuilder();
+            queryBuilder.setModelMapping(this);
+            queryBuilder.table(model.__table);
+            return yield queryBuilder.first(options);
+        });
+    }
+    /**
+     * Creates a new query-builder object and executes get()
+     * @param options?
+     * @returns QueryBulder
+     */
+    static get(options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const model = new this();
+            const queryBuilder = new QueryBuilder_1.QueryBuilder();
+            queryBuilder.setModelMapping(this);
+            queryBuilder.table(model.__table);
+            return yield queryBuilder.get(options);
+        });
+    }
+    /**
+     * Creates a new query-builder object and executes paginate()
+     * @param count
+     * @param options?
+     * @returns QueryBulder
+     */
+    static paginate(count, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const model = new this();
+            const queryBuilder = new QueryBuilder_1.QueryBuilder();
+            queryBuilder.setModelMapping(this);
+            queryBuilder.table(model.__table);
+            return yield queryBuilder.paginate(count, options);
+        });
+    }
     /**
      * Executes a database-aggregation (mostly used by no-sql connections)
      * @param aggregation

package/lib/Database/QueryBuilder.d.ts

@@ -2,13 +2,20 @@ export declare class QueryBuilder {
     database: string | null;
     query: any[];
     queryTable: string;
+    sort: any[];
+    limitCount: number | null;
+    offsetCount: number | null;
     mode: string;
     modelMapping: null;
     setModelMapping(model?: any | null): this;
     table(table: string): this;
     where(column: any, operator: any, value: any): this;
+    orderBy(column: any, sort: any): this;
+    take(count: number | null): this;
+    offset(count: number | null): this;
     get(options?: any): Promise<any>;
     first(options?: any): Promise<any>;
+    paginate(count: number, options?: any): Promise<any>;
     delete(options?: {
         mode: string;
     }): Promise<boolean>;

package/lib/Database/QueryBuilder.js

@@ -16,6 +16,9 @@ class QueryBuilder {
         this.database = null;
         this.query = [];
         this.queryTable = "";
+        this.sort = [];
+        this.limitCount = null;
+        this.offsetCount = null;
         this.mode = "get";
         this.modelMapping = null;
     }
@@ -36,6 +39,21 @@ class QueryBuilder {
         });
         return this;
     }
+    orderBy(column, sort) {
+        this.sort.push({
+            column: column,
+            sort: sort,
+        });
+        return this;
+    }
+    take(count) {
+        this.limitCount = count;
+        return this;
+    }
+    offset(count) {
+        this.offsetCount = count;
+        return this;
+    }
     get(options) {
         return __awaiter(this, void 0, void 0, function* () {
             this.mode = "get";
@@ -62,6 +80,28 @@ class QueryBuilder {
                 : null;
         });
     }
+    paginate(count, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.mode = "paginate";
+            this.take(count);
+            if (options && options.offset !== undefined && options.offset !== null && options.offset !== false) {
+                this.offset(parseInt(options.offset));
+            }
+            else {
+                // @ToDo: Load offset from request
+                this.offset(null);
+            }
+            const result = yield DBConnection_1.DBConnection.runQuery(this);
+            if (options && options.disableModelMapping) {
+                return result && result.length > 0 ? result : null;
+            }
+            return result && result.length > 0 && this.modelMapping !== null
+                ? result.map((el) => DBConnection_1.DBConnection.mapDataToModel(this.modelMapping, el))
+                : result && result.length > 0
+                    ? result
+                    : null;
+        });
+    }
     delete(options) {
         return __awaiter(this, void 0, void 0, function* () {
             this.mode =

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webtypen/webframez-core",
-  "version": "0.0.21",
+  "version": "0.0.22",
   "description": "The core package of the typescript based webframez (web-framework) by webtypen.de",
   "homepage": "https://webtypen.de/",
   "license": "MIT",

package/src/Database/Model.ts

@@ -34,6 +34,65 @@ export class Model {
 
     return queryBuilder;
   }
+  
+  /**
+   * Creates a new query-builder object and adds a orderBy-clause
+   * @param column
+   * @param sort
+   * @returns QueryBulder
+   */
+  static orderBy(column: any, sort: any): QueryBuilder {
+    const model = new this();
+    const queryBuilder = new QueryBuilder();
+    queryBuilder.setModelMapping(this);
+    queryBuilder.table(model.__table);
+    queryBuilder.orderBy(column, sort);
+
+    return queryBuilder;
+  }
+  
+  /**
+   * Creates a new query-builder object and executes first()
+   * @param options?
+   * @returns QueryBulder
+   */
+  static async first(options?: any) {
+    const model = new this();
+    const queryBuilder = new QueryBuilder();
+    queryBuilder.setModelMapping(this);
+    queryBuilder.table(model.__table);
+
+    return await queryBuilder.first(options);
+  }
+  
+  /**
+   * Creates a new query-builder object and executes get()
+   * @param options?
+   * @returns QueryBulder
+   */
+  static async get(options?: any) {
+    const model = new this();
+    const queryBuilder = new QueryBuilder();
+    queryBuilder.setModelMapping(this);
+    queryBuilder.table(model.__table);
+
+    return await queryBuilder.get(options);
+  }
+  
+  /**
+   * Creates a new query-builder object and executes paginate()
+   * @param count
+   * @param options?
+   * @returns QueryBulder
+   */
+  static async paginate(count: number, options?: any) {
+    const model = new this();
+    const queryBuilder = new QueryBuilder();
+    queryBuilder.setModelMapping(this);
+    queryBuilder.table(model.__table);
+
+    return await queryBuilder.paginate(count, options);
+  }
 
   /**
    * Executes a database-aggregation (mostly used by no-sql connections)

package/src/Database/QueryBuilder.ts

@@ -5,6 +5,9 @@ export class QueryBuilder {
   database: string | null = null;
   query: any[] = [];
   queryTable: string = "";
+  sort: any[] = [];
+  limitCount: number | null = null;
+  offsetCount: number | null = null;
   mode = "get";
   modelMapping = null;
 
@@ -27,6 +30,24 @@ export class QueryBuilder {
     });
     return this;
   }
+  
+  orderBy(column: any, sort: any) {
+    this.sort.push({
+      column: column,
+      sort: sort,
+    });
+    return this;
+  }
+  
+  take(count: number | null) {
+    this.limitCount = count;
+    return this; 
+  }
+  
+  offset(count: number | null) {
+    this.offsetCount = count;
+    return this; 
+  }
 
   async get(options?: any) {
     this.mode = "get";
@@ -57,6 +78,31 @@ export class QueryBuilder {
       ? DBConnection.mapDataToModel(this.modelMapping, result)
       : null;
   }
+  
+  async paginate(count: number, options?: any) {
+    this.mode = "paginate";
+    this.take(count);
+    
+    if (options && options.offset !== undefined && options.offset !== null && options.offset !== false) {
+        this.offset(parseInt(options.offset));
+    } else {
+        // @ToDo: Load offset from request
+        this.offset(null);
+    }
+
+    const result = await DBConnection.runQuery(this);
+    if (options && options.disableModelMapping) {
+      return result && result.length > 0 ? result : null;
+    }
+
+    return result && result.length > 0 && this.modelMapping !== null
+      ? result.map((el: Model) =>
+          DBConnection.mapDataToModel(this.modelMapping, el)
+        )
+      : result && result.length > 0
+      ? result
+      : null;
+  }
 
   async delete(options?: { mode: string }) {
     this.mode =