Add in RowResult, autoParse e parse

Author: fernandocode

package.json

@@ -1,6 +1,6 @@
 {
   "name": "database-builder",
-  "version": "0.0.29",
+  "version": "0.0.32",
   "description": "Library to assist in creating and maintaining SQL commands.",
   "main": "./src/index.js",
   "types": "./src/index.d.ts",

src/core/row-result.ts

@@ -1,9 +1,29 @@
+import { MapperTable } from "./../mapper-table";
 import { ExpressionOrColumn, Utils } from "./utils";
+import { DatabaseHelper } from "..";
+import { FieldType } from "./enums/field-type";
 
 export class RowResult<T> {
+    private _databaseHelper: DatabaseHelper;
 
-    constructor(private _valueT: T) {
+    constructor(private _valueT: T, private _mapper?: MapperTable) {
+        this._databaseHelper = new DatabaseHelper();
+    }
+
+    public parse<TReturn>(expression: ExpressionOrColumn<TReturn, T>, type: FieldType): TReturn {
+        const value = Utils.getValue(this._valueT, expression);
+        return this._databaseHelper.databaseToValue(value, type);
+    }
 
+    public autoParse<TReturn>(expression: ExpressionOrColumn<TReturn, T>): TReturn {
+        if (this._mapper) {
+            const column = Utils.getColumn(expression);
+            const value = Utils.getValue(this._valueT, column);
+            return this._databaseHelper.databaseToValue(value, this._mapper.columns.find(x => x.column === column).fieldType);
+        }
+        // tslint:disable-next-line:no-console
+        console.warn(`Auto parse not possible. (MapperTable not found)`);
+        return this.get(expression);
     }
 
     public get<TReturn>(expression: ExpressionOrColumn<TReturn, T>): TReturn {
@@ -15,10 +35,4 @@ export class RowResult<T> {
         // tslint:disable-next-line:triple-equals
         return value == void 0 ? defaultValue : value;
     }
-
-    // public coalesceTTT<R>(expression: ExpressionOrColumnTTT<T, R>, defaultValue: R) {
-    //     const value = this.get(expression);
-    //     // tslint:disable-next-line:triple-equals
-    //     return value == void 0 ? defaultValue : value;
-    // }
 }

src/crud/query/query-readable-builder-base.ts

@@ -35,11 +35,12 @@ export class QueryReadableBuilderBase {
 
     public mapper(
         cursor: DatabaseResult,
+        mapperTable: MapperTable,
         mapper: (row: RowResult<any>) => any,
     ): any {
         const items: any[] = [];
         this.forCursor(cursor, (item) => {
-            items.push(mapper(new RowResult(item)));
+            items.push(mapper(new RowResult(item, mapperTable)));
         });
         return items;
     }

src/crud/query/query.ts

@@ -193,10 +193,12 @@ export class Query<T> implements QueryCompilable {
     }
 
     public mapper(mapper: (row: RowResult<any>) => any): Promise<any[]> {
+        const metadata = this.getMetadata();
+        const mapperTable = metadata ? metadata.mapperTable : void 0;
         return new Promise((resolve, reject) => {
             this.execute()
                 .then((cursor) => {
-                    resolve(this._queryReadableBuilder.mapper(cursor, mapper));
+                    resolve(this._queryReadableBuilder.mapper(cursor, mapperTable, mapper));
                 })
                 .catch(reject);
         });
@@ -227,7 +229,7 @@ export class Query<T> implements QueryCompilable {
         return result;
     }
 
-    private getMetadata(metadata: MetadataTable<T>): MetadataTable<T> {
+    private getMetadata(metadata?: MetadataTable<T>): MetadataTable<T> {
         const result = (metadata ? metadata : this._metadata);
         if (!result) {
             throw new DatabaseBuilderError("MetadataTable not specified in query. Call 'executeAndRead'.");

src/test/models/test-clazz.ts

@@ -8,4 +8,6 @@ export class TestClazz {
     public disabled: boolean = false;
     public date: number = 0;
     public dateMoment: moment.Moment = moment();
+    public dateDate: Date = new Date();
+    public numero = 0;
 }

src/test/projections.spec.ts

@@ -31,7 +31,7 @@ describe("Projections", () => {
         });
         const result = query.compile();
         expect(result.params.length).to.equal(0);
-        expect(result.query).to.equal("SELECT tes.id AS id, tes.description AS description, tes.disabled AS disabled, tes.date AS date, tes.dateMoment AS dateMoment, tes.referenceTest_id AS referenceTest_id FROM TestClazz AS tes");
+        expect(result.query).to.equal("SELECT tes.id AS id, tes.description AS description, tes.disabled AS disabled, tes.date AS date, tes.dateMoment AS dateMoment, tes.dateDate AS dateDate, tes.numero AS numero, tes.referenceTest_id AS referenceTest_id FROM TestClazz AS tes");
     });
 
     it("add column", () => {

src/test/row-result.spec.ts

@@ -1,5 +1,10 @@
+import { TestClazzRef } from "./models/test-clazz-ref";
 import { RowResult } from "./../core/row-result";
 import { expect } from "chai";
+import { MappersTable } from "./mappers-table";
+import { TestClazz } from "./models/test-clazz";
+import * as moment from "moment";
+import { FieldType } from "../core/enums/field-type";
 
 describe("Row Result", () => {
 
@@ -22,27 +27,34 @@ describe("Row Result", () => {
         expect(rowResult.coalesce(x => x.d, new Date())).to.equal(model.d);
     });
 
-    // it("Query", () => {
-    //     const query = new Query(TestClazz);
-
-    //     const model = {
-    //         id: 1,
-    //         description: "Descrição",
-    //         referenceTest: {
-    //             id: 2,
-    //             description: "Referencia"
-    //         } as TestClazzRef,
-    //         disabled: false
-    //     } as TestClazz;
-
-    //     query.mapper((row: RowResult<any>) => {
-    //         expect(row.get("description")).to.equal(model.description);
-    //         expect(row.get(x => x.id)).to.equal(model.id);
-    //         expect(row.get(x => x.test)).to.equal(model.test);
-    //         expect(row.get("ttt")).to.equal(void 0);
-    //         expect(row.coalesce("ttt", 123)).to.equal(123);
-    //         expect(row.coalesce(x => x.age, 123)).to.equal(model.age);
-    //     });
-    // });
+    const mappersTable = new MappersTable();
+
+    it("With Mapper", () => {
+        const defaultMoment = moment.utc();
+
+        const model: any = {};
+        model.id = 1;
+        model.description = "Abc";
+        model.disabled = true;
+        model.numero = 10;
+        model.dateMoment = defaultMoment.unix();
+        model.dateDate = void 0;
+        model.date = 1;
+        model.referenceTest = new TestClazzRef();
+
+        const rowResult = new RowResult(model, mappersTable.getMapper(TestClazz).mapperTable);
+        expect(rowResult.get(x => x.description)).to.equal(model.description);
+        expect(rowResult.get(x => x.id)).to.equal(model.id);
+        expect(rowResult.get(x => x.disabled)).to.equal(model.disabled);
+        expect(rowResult.get("ttt")).to.equal(void 0);
+        expect(rowResult.coalesce("ttt", 123)).to.equal(123);
+        expect(rowResult.coalesce(x => x.numero, 123)).to.equal(model.numero);
+        expect(rowResult.get(x => x.dateDate)).to.equal(model.dateDate);
+        expect(rowResult.get(x => x.dateMoment)).to.equal(defaultMoment.unix());
+        expect(rowResult.autoParse(x => x.dateMoment).format("DD/MM/YYYY")).to.equal(defaultMoment.format("DD/MM/YYYY"));
+        expect(rowResult.parse(x => x.dateMoment, FieldType.DATE).format("DD/MM/YYYY")).to.equal(defaultMoment.format("DD/MM/YYYY"));
+        const defaultDate = new Date();
+        expect(rowResult.coalesce(x => x.dateDate, defaultDate)).to.equal(defaultDate);
+    });
 
 });