namirasoft-node 1.0.22 → 1.0.24

package/dist/BaseMySqlDatabase.d.ts

@@ -1,4 +1,4 @@
 import { BaseSequelizeDatabase } from "./BaseSequelizeDatabase";
 export declare abstract class BaseMySqlDatabase extends BaseSequelizeDatabase {
-    constructor(name: string, user: string, pass: string, host: string, port: number, logging?: boolean);
+    constructor(host: string, port: number, name: string, user: string, pass: string, logging?: boolean);
 }

package/dist/BaseMySqlDatabase.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseMySqlDatabase = void 0;
 const BaseSequelizeDatabase_1 = require("./BaseSequelizeDatabase");
 class BaseMySqlDatabase extends BaseSequelizeDatabase_1.BaseSequelizeDatabase {
-    constructor(name, user, pass, host, port, logging = false) {
-        super('mysql', name, user, pass, host, port, logging);
+    constructor(host, port, name, user, pass, logging = false) {
+        super('mysql', host, port, name, user, pass, logging);
     }
 }
 exports.BaseMySqlDatabase = BaseMySqlDatabase;

package/dist/BaseSequelizeDatabase.d.ts

@@ -1,15 +1,12 @@
 import { Sequelize, Dialect } from "sequelize";
-import { Model, ModelCtor, FindOptions, Transaction, ModelAttributes, Attributes, ModelOptions } from 'sequelize';
+import { FindOptions, Transaction, Attributes } from 'sequelize';
 import { BaseDatabase } from "./BaseDatabase";
 import { BaseSequelizeModel } from "./BaseSequelizeModel";
 import { Where } from "sequelize/types/utils";
 export declare abstract class BaseSequelizeDatabase extends BaseDatabase {
-    protected sequelize: Sequelize;
-    constructor(dialect: Dialect, name: string, user: string, pass: string, host: string, port: number, logging?: boolean);
-    define<M extends Model, TAttributes = Attributes<M>>(modelName: string, attributes: ModelAttributes<M, TAttributes>, options?: ModelOptions<M>): ModelCtor<M>;
+    sequelize: Sequelize;
+    constructor(dialect: Dialect, host: string, port: number, name: string, user: string, pass: string, logging?: boolean);
     startTransaction<T>(handler: (trx: Transaction) => Promise<T>, trx: Transaction | null): Promise<T>;
-    getModel<M extends BaseSequelizeModel>(modelName: string, options: FindOptions<Attributes<M>>, trx: Transaction | null): Promise<M>;
-    getModelOrNull<M extends BaseSequelizeModel>(modelName: string, options: FindOptions<Attributes<M>>, trx: Transaction | null): Promise<M | null>;
     getGoogleSearchConditions(columns: string[], search: string, conditions: Where[]): Where[];
     paginate<T extends BaseSequelizeModel>(options: FindOptions<Attributes<T>>, page_number: number, page_size: number, page_size_default?: number): void;
 }

package/dist/BaseSequelizeDatabase.js

@@ -12,9 +12,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseSequelizeDatabase = void 0;
 const sequelize_1 = require("sequelize");
 const BaseDatabase_1 = require("./BaseDatabase");
-const namirasoft_core_1 = require("namirasoft-core");
 class BaseSequelizeDatabase extends BaseDatabase_1.BaseDatabase {
-    constructor(dialect, name, user, pass, host, port, logging = false) {
+    constructor(dialect, host, port, name, user, pass, logging = false) {
         super();
         this.sequelize = new sequelize_1.Sequelize(name, user, pass, {
             dialect,
@@ -23,32 +22,6 @@ class BaseSequelizeDatabase extends BaseDatabase_1.BaseDatabase {
             logging
         });
     }
-    define(modelName, attributes, options) {
-        if (!options)
-            options = {};
-        if (options.name == undefined)
-            options.name = {
-                plural: modelName,
-                singular: modelName
-            };
-        if (options.paranoid == undefined)
-            options.paranoid = true;
-        if (options.freezeTableName == undefined)
-            options.freezeTableName = true;
-        if (options.tableName == undefined)
-            options.tableName = modelName;
-        if (options.underscored == undefined)
-            options.underscored = true;
-        if (options.timestamps == undefined)
-            options.timestamps = true;
-        if (options.paranoid == undefined)
-            options.paranoid = true;
-        if (options.createdAt == undefined)
-            options.createdAt = true;
-        if (options.updatedAt == undefined)
-            options.updatedAt = true;
-        return this.sequelize.define(modelName, attributes, options);
-    }
     startTransaction(handler, trx) {
         return __awaiter(this, void 0, void 0, function* () {
             if (trx)
@@ -65,23 +38,6 @@ class BaseSequelizeDatabase extends BaseDatabase_1.BaseDatabase {
             }
         });
     }
-    getModel(modelName, options, trx) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let value = yield this.getModelOrNull(modelName, options, trx);
-            if (value != null)
-                return value;
-            throw namirasoft_core_1.ErrorOperation.getHTTP(404, "Could not found " + modelName);
-        });
-    }
-    getModelOrNull(modelName, options, trx) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!options)
-                options = {};
-            options.transaction = trx;
-            let model = this.sequelize.models[modelName];
-            return yield model.findOne(options);
-        });
-    }
     getGoogleSearchConditions(columns, search, conditions) {
         if (!conditions)
             conditions = [];

package/dist/BaseSequelizeDatabase.js.map

@@ -1 +1 @@
-{"version":3,"file":"BaseSequelizeDatabase.js","sourceRoot":"","sources":["../src/BaseSequelizeDatabase.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"BaseSequelizeDatabase.js","sourceRoot":"","sources":["../src/BaseSequelizeDatabase.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yCAAmD;AAEnD,iDAA8C;AAI9C,MAAsB,qBAAsB,SAAQ,2BAAY;IAG5D,YAAY,OAAgB,EAAE,IAAY,EAAE,IAAY,EAAE,IAAY,EAAE,IAAY,EAAE,IAAY,EAAE,UAAmB,KAAK;QAExH,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,SAAS,GAAG,IAAI,qBAAS,CAC1B,IAAI,EACJ,IAAI,EACJ,IAAI,EACJ;YACI,OAAO;YACP,IAAI;YACJ,IAAI;YACJ,OAAO;SACV,CAAC,CAAC;IACX,CAAC;IACK,gBAAgB,CAAI,OAAyC,EAAE,GAAuB;;YAExF,IAAI,GAAG;gBACH,OAAO,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC;YAC9B,GAAG,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,CAAC;YACzC,IACA;gBACI,IAAI,MAAM,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC;gBAChC,MAAM,GAAG,CAAC,MAAM,EAAE,CAAC;gBACnB,OAAO,MAAM,CAAC;aACjB;YACD,OAAO,KAAK,EACZ;gBACI,MAAM,GAAG,CAAC,QAAQ,EAAE,CAAC;gBACrB,MAAM,KAAK,CAAC;aACf;QACL,CAAC;KAAA;IACD,yBAAyB,CAAC,OAAiB,EAAE,MAAc,EAAE,UAAmB;QAE5E,IAAI,CAAC,UAAU;YACX,UAAU,GAAG,EAAE,CAAC;QACpB,IAAI,MAAM;YACN,IAAI,MAAM,CAAC,KAAK,EAChB;gBACI,IAAI,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBAC7B,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EACnB;oBACI,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EACpC;wBACI,IAAI,IAAI,GAAG,EAAE,CAAC,cAAE,CAAC,IAAI,CAAC,EAAE,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,GAAG,GAAG,EAAE,CAAC;wBACrD,IAAI,IAAI,CAAC;wBACT,IAAI,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,qBAAS,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;wBACtD,IAAI,GAAG,qBAAS,CAAC,EAAE,CACf,QAAQ,EACR,GAAG,EAAE,CACR,CAAC;wBACF,IAAI,SAAS,GAAG,qBAAS,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;wBAC5C,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;qBAC9B;iBACJ;aACJ;QACL,OAAO,UAAU,CAAC;IACtB,CAAC;IAED,QAAQ,CAA+B,OAAmC,EACtE,WAAmB,EAAE,SAAiB,EAAE,iBAA0B;QAElE,cAAc;QACd,IAAI,KAAK,CAAC,WAAW,CAAC;YAClB,WAAW,GAAG,CAAC,CAAC;QACpB,YAAY;QACZ,IAAI,KAAK,CAAC,SAAS,CAAC;YAChB,IAAI,iBAAiB;gBACjB,SAAS,GAAG,iBAAiB,CAAC;QACtC,IAAI,KAAK,CAAC,SAAS,CAAC;YAChB,SAAS,GAAG,EAAE,CAAC;QACnB,EAAE;QACF,OAAO,CAAC,MAAM,GAAG,CAAC,WAAW,GAAG,CAAC,CAAC,GAAG,SAAS,CAAC;QAC/C,OAAO,CAAC,KAAK,GAAG,SAAS,CAAC;IAC9B,CAAC;CACJ;AA7ED,sDA6EC"}

package/dist/BaseSequelizeModel.js.map

@@ -1 +1 @@
-{"version":3,"file":"BaseSequelizeModel.js","sourceRoot":"","sources":["../src/BaseSequelizeModel.ts"],"names":[],"mappings":";;;AACA,yCAAkC;AAElC,MAAsB,kBAAmB,SAAQ,iBAAK;CAGrD;AAHD,gDAGC"}
+{"version":3,"file":"BaseSequelizeModel.js","sourceRoot":"","sources":["../src/BaseSequelizeModel.ts"],"names":[],"mappings":";;;AAAA,yCAAkC;AAElC,MAAsB,kBAAmB,SAAQ,iBAAK;CAErD;AAFD,gDAEC"}

package/dist/BaseSequelizeTable.d.ts

@@ -1,8 +1,11 @@
-import { ModelCtor } from "sequelize";
+import { ModelOptions, ModelAttributes } from "sequelize";
 import { BaseSequelizeDatabase } from "./BaseSequelizeDatabase";
-import { BaseSequelizeModel } from "./BaseSequelizeModel";
 import { BaseTable } from "./BaseTable";
+import { ModelCtor, FindOptions, Transaction, Attributes } from 'sequelize';
+import { BaseSequelizeModel } from "./BaseSequelizeModel";
 export declare class BaseSequelizeTable<D extends BaseSequelizeDatabase, M extends BaseSequelizeModel> extends BaseTable<D> {
     model: ModelCtor<M>;
     constructor(database: D);
+    find(options: FindOptions<Attributes<M>>, trx: Transaction | null): Promise<M>;
+    define<TAttributes = Attributes<M>>(modelName: string, attributes: ModelAttributes<M, TAttributes>, options?: ModelOptions<M>): void;
 }

package/dist/BaseSequelizeTable.js

@@ -1,11 +1,56 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseSequelizeTable = void 0;
 const BaseTable_1 = require("./BaseTable");
+const namirasoft_core_1 = require("namirasoft-core");
 class BaseSequelizeTable extends BaseTable_1.BaseTable {
     constructor(database) {
         super(database);
     }
+    find(options, trx) {
+        return __awaiter(this, void 0, void 0, function* () {
+            options.transaction = trx;
+            let value = yield this.model.findOne(options);
+            if (value != null)
+                return value;
+            throw namirasoft_core_1.ErrorOperation.getHTTP(404, "Could not found " + this.model.name);
+        });
+    }
+    define(modelName, attributes, options) {
+        if (!options)
+            options = {};
+        if (options.name == undefined)
+            options.name = {
+                plural: modelName,
+                singular: modelName
+            };
+        if (options.paranoid == undefined)
+            options.paranoid = true;
+        if (options.freezeTableName == undefined)
+            options.freezeTableName = true;
+        if (options.tableName == undefined)
+            options.tableName = modelName;
+        if (options.underscored == undefined)
+            options.underscored = true;
+        if (options.timestamps == undefined)
+            options.timestamps = true;
+        if (options.paranoid == undefined)
+            options.paranoid = true;
+        if (options.createdAt == undefined)
+            options.createdAt = true;
+        if (options.updatedAt == undefined)
+            options.updatedAt = true;
+        this.model = this.database.sequelize.define(modelName, attributes, options);
+    }
 }
 exports.BaseSequelizeTable = BaseSequelizeTable;
 //# sourceMappingURL=BaseSequelizeTable.js.map

package/dist/BaseSequelizeTable.js.map

@@ -1 +1 @@
-{"version":3,"file":"BaseSequelizeTable.js","sourceRoot":"","sources":["../src/BaseSequelizeTable.ts"],"names":[],"mappings":";;;AAGA,2CAAwC;AAExC,MAAa,kBAAkF,SAAQ,qBAAY;IAG/G,YAAY,QAAW;QAEnB,KAAK,CAAC,QAAQ,CAAC,CAAC;IACpB,CAAC;CACJ;AAPD,gDAOC"}
+{"version":3,"file":"BaseSequelizeTable.js","sourceRoot":"","sources":["../src/BaseSequelizeTable.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,2CAAwC;AAGxC,qDAAiD;AAEjD,MAAa,kBAAkF,SAAQ,qBAAY;IAG/G,YAAY,QAAW;QAEnB,KAAK,CAAC,QAAQ,CAAC,CAAC;IACpB,CAAC;IACK,IAAI,CAAC,OAAmC,EAAE,GAAuB;;YAEnE,OAAO,CAAC,WAAW,GAAG,GAAG,CAAC;YAC1B,IAAI,KAAK,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,CAAI,OAAO,CAAC,CAAC;YACjD,IAAI,KAAK,IAAI,IAAI;gBACb,OAAO,KAAK,CAAC;YACjB,MAAM,gCAAc,CAAC,OAAO,CAAC,GAAG,EAAE,kBAAkB,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC5E,CAAC;KAAA;IACD,MAAM,CACF,SAAiB,EACjB,UAA2C,EAC3C,OAAyB;QAGzB,IAAI,CAAC,OAAO;YACR,OAAO,GAAG,EAAE,CAAC;QACjB,IAAI,OAAO,CAAC,IAAI,IAAI,SAAS;YACzB,OAAO,CAAC,IAAI,GAAG;gBACX,MAAM,EAAE,SAAS;gBACjB,QAAQ,EAAE,SAAS;aACtB,CAAC;QACN,IAAI,OAAO,CAAC,QAAQ,IAAI,SAAS;YAC7B,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC;QAC5B,IAAI,OAAO,CAAC,eAAe,IAAI,SAAS;YACpC,OAAO,CAAC,eAAe,GAAG,IAAI,CAAC;QACnC,IAAI,OAAO,CAAC,SAAS,IAAI,SAAS;YAC9B,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;QAClC,IAAI,OAAO,CAAC,WAAW,IAAI,SAAS;YAChC,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC;QAC/B,IAAI,OAAO,CAAC,UAAU,IAAI,SAAS;YAC/B,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC;QAC9B,IAAI,OAAO,CAAC,QAAQ,IAAI,SAAS;YAC7B,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC;QAC5B,IAAI,OAAO,CAAC,SAAS,IAAI,SAAS;YAC9B,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC;QAC7B,IAAI,OAAO,CAAC,SAAS,IAAI,SAAS;YAC9B,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC;QAE7B,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,MAAM,CAAC,SAAS,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;IAChF,CAAC;CACJ;AA/CD,gDA+CC"}

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "namirasoft-node",
     "description": "Namira Software Corporation Node NPM Package",
-    "version": "1.0.22",
+    "version": "1.0.24",
     "main": "./dist/index.js",
     "types": "./dist/index.d.ts",
     "scripts": {},
@@ -19,11 +19,11 @@
         "express": "^4.18.2",
         "joi": "^17.11.0",
         "namirasoft-core": "^1.0.13",
-        "namirasoft-log": "^1.0.1",
+        "namirasoft-log": "^1.0.3",
         "nodemailer": "^6.9.7",
         "nodemailer-smtp-transport": "^2.7.4",
         "request-ip": "^3.3.0",
-        "sequelize": "^6.34.0",
+        "sequelize": "^6.35.0",
         "swagger-jsdoc": "^6.2.8",
         "swagger-ui-express": "^5.0.0"
     },

package/src/BaseMySqlDatabase.ts

@@ -1,8 +1,8 @@
 import { BaseSequelizeDatabase } from "./BaseSequelizeDatabase";
 export abstract class BaseMySqlDatabase extends BaseSequelizeDatabase
 {
-    constructor(name: string, user: string, pass: string, host: string, port: number, logging: boolean = false)
+    constructor(host: string, port: number, name: string, user: string, pass: string, logging: boolean = false)
     {
-        super('mysql', name, user, pass, host, port, logging);
+        super('mysql', host, port, name, user, pass, logging);
     }
 }

package/src/BaseSequelizeDatabase.ts

@@ -1,14 +1,13 @@
 import { Sequelize, Dialect, Op } from "sequelize";
-import { Model, ModelCtor, FindOptions, Transaction, ModelAttributes, Attributes, ModelOptions } from 'sequelize';
+import { FindOptions, Transaction, Attributes } from 'sequelize';
 import { BaseDatabase } from "./BaseDatabase";
 import { BaseSequelizeModel } from "./BaseSequelizeModel";
-import { ErrorOperation } from "namirasoft-core";
 import { Where } from "sequelize/types/utils";
 
 export abstract class BaseSequelizeDatabase extends BaseDatabase
 {
-    protected sequelize: Sequelize;
-    constructor(dialect: Dialect, name: string, user: string, pass: string, host: string, port: number, logging: boolean = false)
+    public sequelize: Sequelize;
+    constructor(dialect: Dialect, host: string, port: number, name: string, user: string, pass: string, logging: boolean = false)
     {
         super();
         this.sequelize = new Sequelize(
@@ -22,38 +21,6 @@ export abstract class BaseSequelizeDatabase extends BaseDatabase
                 logging
             });
     }
-    define<M extends Model, TAttributes = Attributes<M>>(
-        modelName: string,
-        attributes: ModelAttributes<M, TAttributes>,
-        options?: ModelOptions<M>
-    ): ModelCtor<M>
-    {
-        if (!options)
-            options = {};
-        if (options.name == undefined)
-            options.name = {
-                plural: modelName,
-                singular: modelName
-            };
-        if (options.paranoid == undefined)
-            options.paranoid = true;
-        if (options.freezeTableName == undefined)
-            options.freezeTableName = true;
-        if (options.tableName == undefined)
-            options.tableName = modelName;
-        if (options.underscored == undefined)
-            options.underscored = true;
-        if (options.timestamps == undefined)
-            options.timestamps = true;
-        if (options.paranoid == undefined)
-            options.paranoid = true;
-        if (options.createdAt == undefined)
-            options.createdAt = true;
-        if (options.updatedAt == undefined)
-            options.updatedAt = true;
-
-        return this.sequelize.define(modelName, attributes, options);
-    }
     async startTransaction<T>(handler: (trx: Transaction) => Promise<T>, trx: Transaction | null): Promise<T>
     {
         if (trx)
@@ -71,21 +38,6 @@ export abstract class BaseSequelizeDatabase extends BaseDatabase
             throw error;
         }
     }
-    async getModel<M extends BaseSequelizeModel>(modelName: string, options: FindOptions<Attributes<M>>, trx: Transaction | null): Promise<M> 
-    {
-        let value = await this.getModelOrNull(modelName, options, trx);
-        if (value != null)
-            return value;
-        throw ErrorOperation.getHTTP(404, "Could not found " + modelName);
-    }
-    async getModelOrNull<M extends BaseSequelizeModel>(modelName: string, options: FindOptions<Attributes<M>>, trx: Transaction | null): Promise<M | null> 
-    {
-        if (!options)
-            options = {};
-        options.transaction = trx;
-        let model = this.sequelize.models[modelName] as ModelCtor<M>;
-        return await model.findOne<M>(options);
-    }
     getGoogleSearchConditions(columns: string[], search: string, conditions: Where[])
     {
         if (!conditions)

package/src/BaseSequelizeModel.ts

@@ -1,7 +1,5 @@
-
 import { Model } from 'sequelize';
 
 export abstract class BaseSequelizeModel extends Model
 {
-
 }

package/src/BaseSequelizeTable.ts

@@ -1,7 +1,9 @@
-import { ModelCtor } from "sequelize";
+import { ModelOptions, ModelAttributes } from "sequelize";
 import { BaseSequelizeDatabase } from "./BaseSequelizeDatabase";
-import { BaseSequelizeModel } from "./BaseSequelizeModel";
 import { BaseTable } from "./BaseTable";
+import { ModelCtor, FindOptions, Transaction, Attributes } from 'sequelize';
+import { BaseSequelizeModel } from "./BaseSequelizeModel";
+import { ErrorOperation } from "namirasoft-core";
 
 export class BaseSequelizeTable<D extends BaseSequelizeDatabase, M extends BaseSequelizeModel> extends BaseTable<D>
 {
@@ -10,4 +12,44 @@ export class BaseSequelizeTable<D extends BaseSequelizeDatabase, M extends BaseS
     {
         super(database);
     }
+    async find(options: FindOptions<Attributes<M>>, trx: Transaction | null): Promise<M> 
+    {
+        options.transaction = trx;
+        let value = await this.model.findOne<M>(options);
+        if (value != null)
+            return value;
+        throw ErrorOperation.getHTTP(404, "Could not found " + this.model.name);
+    }
+    define<TAttributes = Attributes<M>>(
+        modelName: string,
+        attributes: ModelAttributes<M, TAttributes>,
+        options?: ModelOptions<M>
+    ): void
+    {
+        if (!options)
+            options = {};
+        if (options.name == undefined)
+            options.name = {
+                plural: modelName,
+                singular: modelName
+            };
+        if (options.paranoid == undefined)
+            options.paranoid = true;
+        if (options.freezeTableName == undefined)
+            options.freezeTableName = true;
+        if (options.tableName == undefined)
+            options.tableName = modelName;
+        if (options.underscored == undefined)
+            options.underscored = true;
+        if (options.timestamps == undefined)
+            options.timestamps = true;
+        if (options.paranoid == undefined)
+            options.paranoid = true;
+        if (options.createdAt == undefined)
+            options.createdAt = true;
+        if (options.updatedAt == undefined)
+            options.updatedAt = true;
+
+        this.model = this.database.sequelize.define(modelName, attributes, options);
+    }
 }