fix for insert date in moment format with null value.

Added test for fixed bug.

Author: fernandocode

package.json

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

src/datetime-utils.ts

@@ -4,10 +4,13 @@ import { DatabaseBuilderError } from "./core/errors";
 export class DatetimeUtils {
 
     public static datetimeToDatabase(date: moment.Moment): number {
-        if (!date.unix) {
-            throw new DatabaseBuilderError("Date format incorrect");
+        if (date) {
+            if (!date.unix) {
+                throw new DatabaseBuilderError("Date format incorrect");
+            }
+            return date.unix();
         }
-        return date.unix();
+        return void 0;
     }
 
     public static dateToDatabase(date: any): number {
@@ -19,6 +22,9 @@ export class DatetimeUtils {
     }
 
     public static databaseToDatetime(unix: number) {
-        return moment.utc(unix * 1000);
+        if (unix) {
+            return moment.utc(unix * 1000);
+        }
+        return void 0;
     }
 }

src/test/create.spec.ts

@@ -89,7 +89,7 @@ describe("Create", () => {
         const create = new Create(ContasReceber, mapper.get(ContasReceber));
         const result = create.compile();
         expect(result.length > 0).to.equal(true);
-        expect(result).to.equal(`CREATE TABLE IF NOT EXISTS ContasReceber( internalKey INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, codeImport INTEGER, valor INTEGER, cliente_codeImport INTEGER );`);
+        expect(result).to.equal(`CREATE TABLE IF NOT EXISTS ContasReceber( internalKey INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, codeImport INTEGER, valor INTEGER, dataRecebimento INTEGER, dataVencimento INTEGER, cliente_codeImport INTEGER );`);
     });
 
     it("Test create", () => {
@@ -104,7 +104,6 @@ describe("Create", () => {
         const result = create.compile();
         expect(result.length > 0).to.equal(true);
         expect(result).to.equal(`CREATE TABLE IF NOT EXISTS TestClazzRefCode( code TEXT NOT NULL PRIMARY KEY, description TEXT, reference_description TEXT );`);
-        // expect(result).to.equal(`CREATE TABLE IF NOT EXISTS TestClazzRefCode( code TEXT NOT NULL PRIMARY KEY AUTOINCREMENT, description TEXT, reference_id INTEGER );`);
     });
 
     it("TestClazz", () => {

src/test/insert.spec.ts

@@ -13,6 +13,7 @@ import { ObjectToTest } from "./objeto-to-test";
 import { GuidClazz } from "./models/guid-clazz";
 import { TestClazzRefCode } from "./models/test-clazz-ref-code";
 import { Insert } from "../crud/insert/insert";
+import { ContasReceber } from "./models/contas-receber";
 
 describe("Insert", () => {
     const mapper = new MappersTableNew();
@@ -109,4 +110,21 @@ describe("Insert", () => {
         expect(result.query).to.equal("INSERT INTO TestClazzRefCode (code, description, reference_description) VALUES (?, ?, ?)");
     });
 
+    it("TestClazzRefCode", () => {
+        const result = new Insert(TestClazzRefCode, ObjectToTest.testClazzRefCode, mapper.get(TestClazzRefCode)).compile();
+        expect(result.params.toString()).to.equal([
+            ObjectToTest.testClazzRefCode.code, ObjectToTest.testClazzRefCode.description, ObjectToTest.testClazzRefCode.reference.description
+        ].toString());
+        expect(result.query).to.equal("INSERT INTO TestClazzRefCode (code, description, reference_description) VALUES (?, ?, ?)");
+    });
+
+    it("ContasAReceber", () => {
+        const result = new Insert(ContasReceber, ObjectToTest.contasReceber, mapper.get(ContasReceber)).compile();
+        expect(result.params.toString()).to.equal([
+            ObjectToTest.contasReceber.codeImport, ObjectToTest.contasReceber.valor,
+            void 0, ObjectToTest.contasReceber.dataVencimento.unix(),
+            ObjectToTest.contasReceber.cliente.codeImport
+        ].toString());
+        expect(result.query).to.equal("INSERT INTO ContasReceber (codeImport, valor, dataRecebimento, dataVencimento, cliente_codeImport) VALUES (?, ?, ?, ?, ?)");
+    });
 });

src/test/models/contas-receber.ts

@@ -1,10 +1,14 @@
 import { Cliente } from "./cliente";
 import { BaseModel } from "./base-model";
+import * as moment from "moment";
 
 export class ContasReceber extends BaseModel<number>  {
 
     public valor: number = 0;
     public cliente: Cliente = new Cliente();
+    // Deixar esse valor nulo para teste
+    public dataRecebimento: moment.Moment = moment();
+    public dataVencimento: moment.Moment = moment();
 
     constructor() {
         super(0);

src/test/objeto-to-test.ts

@@ -12,6 +12,7 @@ import { Uf } from "./models/uf";
 import { Cidade } from "./models/cidade";
 import { Cliente } from "./models/cliente";
 import * as moment from "moment";
+import { ContasReceber } from "./models/contas-receber";
 
 export class ObjectToTest {
 
@@ -101,4 +102,12 @@ export class ObjectToTest {
             description: "jgagdada"
         } as TestClazzRefCode
     } as TestClazz;
+
+    public static contasReceber = {
+        codeImport: 10,
+        valor: 1023.45,
+        cliente: ObjectToTest.cliente,
+        dataRecebimento: void 0,
+        dataVencimento: moment()
+    } as ContasReceber;
 }

src/test/sqlite.spec.ts

@@ -1,3 +1,4 @@
+import { ContasReceber } from "./models/contas-receber";
 import { Ddl } from "./../ddl/ddl";
 import { SQLiteDatabase } from "./database/sqlite-database";
 import { expect } from "chai";
@@ -7,6 +8,7 @@ import { MappersTableNew } from "./mappers-table-new";
 import { Crud } from "../crud";
 import { GuidClazz } from "./models/guid-clazz";
 import { Uf } from "./models/uf";
+import * as moment from "moment";
 
 describe("SQLite", async () => {
     const mapper = new MappersTableNew();
@@ -83,4 +85,20 @@ describe("SQLite", async () => {
         expect(queryResult[0].codeImport).to.equal(ObjectToTest.cidade.codeImport);
     });
 
+    it("ContasAReceber", async () => {
+
+        await ddl.create(ContasReceber).execute();
+
+        const insertResult1 = await crud.insert(ContasReceber, ObjectToTest.contasReceber).execute();
+        expect(insertResult1.rowsAffected, "insert").to.equal(1);
+
+        const queryResult = await crud.query(ContasReceber)
+            .where(where => where.equal(x => x.cliente.codeImport, ObjectToTest.contasReceber.cliente.codeImport))
+            .toList();
+
+        expect(queryResult.length).to.equal(1);
+        expect(queryResult[0].codeImport).to.equal(ObjectToTest.contasReceber.codeImport);
+        expect(queryResult[0].dataRecebimento).to.equal(void 0);
+    });
+
 });