@spinajs/orm 1.0.60 → 1.2.32

package/lib/model.d.ts

@@ -1,9 +1,9 @@
 import { IModelDescrtiptor, InsertBehaviour } from './interfaces';
 import { WhereFunction } from './types';
-import { RawQuery, UpdateQueryBuilder, SelectQueryBuilder, DeleteQueryBuilder, InsertQueryBuilder } from './builders';
+import { RawQuery, UpdateQueryBuilder, SelectQueryBuilder, InsertQueryBuilder } from './builders';
 import { WhereOperators } from './enums';
 export declare function extractModelDescriptor(targetOrForward: any): IModelDescrtiptor;
-export declare abstract class ModelBase<T> {
+export declare class ModelBase {
     /**
      * Gets descriptor for this model. It contains information about relations, orm driver, connection properties,
      * db table attached, column information and others.
@@ -15,119 +15,121 @@ export declare abstract class ModelBase<T> {
     /**
      * Get all data from db
      */
-    static all<T>(_page?: number, _perPage?: number): SelectQueryBuilder<T>;
+    static all<T extends typeof ModelBase>(this: T, _page?: number, _perPage?: number): SelectQueryBuilder<Array<InstanceType<T>>>;
     /**
-     * Inserts data to DB
+     * Inserts data to DB.
      *
-     * @param _data data to insert
+     * @param _data - data to insert
      */
-    static insert<T extends ModelBase<T>>(_data: T | object): InsertQueryBuilder;
+    static insert<T extends typeof ModelBase>(this: T, _data: InstanceType<T> | Partial<InstanceType<T>> | Array<InstanceType<T>> | Array<Partial<InstanceType<T>>>): InsertQueryBuilder;
     /**
-     * Inserts multiple data at once to DB
+     * Search entities in db
      *
-     * @param _data data to insert
+     * @param column - column to search or function
+     * @param operator - boolean operator
+     * @param value - value to compare
      */
-    static insertBulk<T extends ModelBase<T>>(_data: T[] | object[]): Promise<void>;
+    static where<T extends typeof ModelBase>(this: T, _column: string | boolean | WhereFunction | RawQuery | object, _operator?: WhereOperators | any, _value?: any): SelectQueryBuilder<Array<InstanceType<T>>>;
     /**
-     * Search entities in db
+     * Updates single or multiple records at once with provided value based on condition
      *
-     * @param column column to search or function
-     * @param operator boolean operator
-     * @param value value to compare
+     * @param _data - data to set
+     */
+    static update<T extends typeof ModelBase>(this: T, _data: Partial<InstanceType<T>>): UpdateQueryBuilder;
+    /**
+     * Tries to find all models with given primary keys
+     */
+    static find<T extends typeof ModelBase>(this: T, _pks: any[]): Promise<Array<InstanceType<T>>>;
+    /**
+     * Tries to find all models in db. If not all exists, throws exception
+     */
+    static findOrFail<T extends typeof ModelBase>(this: T, _pks: any[]): Promise<Array<InstanceType<T>>>;
+    /**
+     * gets model by specified pk, if not exists, returns null
      *
-     * @returns {SelectQueryBuilder} fluent query builder to add more conditions if needed
      */
-    static where<T>(_column: string | boolean | WhereFunction | RawQuery | {}, _operator?: WhereOperators | any, _value?: any): SelectQueryBuilder<T>;
+    static get<T extends typeof ModelBase>(this: T, _pk: any): Promise<InstanceType<T>>;
     /**
-     * Updates single or multiple records at once with provided value based on condition
+     * Finds model by specified pk. If model not exists in db throws exception
      *
-     * @param _data data to set
      */
-    static update(_data: object): UpdateQueryBuilder;
-    static find<T>(pks: any[]): Promise<T[]>;
-    static find<T>(pks: any): Promise<T>;
+    static getOrFail<T extends typeof ModelBase>(this: T, _pk: any): Promise<InstanceType<T>>;
     /**
-     * Finds model by specified pk
      *
-     * @param _pk pk to find
+     * Checks if model with pk key or unique fields exists and if not creates one AND NOT save in db
+     * NOTE: it checks for unique fields constraint
      */
-    static findOrFail<T>(_pk: any): Promise<T>;
+    static getOrNew<T extends typeof ModelBase>(this: T, _pk?: any, _data?: Partial<InstanceType<T>>): Promise<InstanceType<T>>;
     /**
      * Creates raw query on this model. used for quering db for partial data or to perform some kind of operations
      * that dont need full ORM model to involve
      */
-    static query<T>(): SelectQueryBuilder<T>;
+    static query<T>(this: T): SelectQueryBuilder<T>;
     /**
      *
      * Checks if model with pk key / unique fields exists and if not creates one and saves to db
      * NOTE: it checks for unique fields too.
      *
-     * @param {any} data - model width data to check
+     * @param data - model width data to check
      */
-    static firstOrCreate<T>(_pk: any, _data?: any): Promise<T>;
+    static getOrCreate<T extends typeof ModelBase>(this: T, _pk: any, _data?: Partial<InstanceType<T>>): Promise<InstanceType<T>>;
     /**
      * Creates new model & saves is to db
      *
-     * @param {any} data - initial model data
-     */
-    static create<T>(_data?: any): Promise<T>;
-    /**
-     *
-     * Checks if model with pk key or unique fields exists and if not creates one AND NOT save in db
-     * NOTE: it checks for unique fields constraint
-     *
-     * @param {any} data - model to check
+     * @param  data - initial model data
      */
-    static firstOrNew<T>(_data?: any): Promise<T>;
+    static create<T extends typeof ModelBase>(this: T, _data: Partial<InstanceType<T>>): Promise<InstanceType<T>>;
     /**
      * Deletes model from db
      *
-     * @param pk? primary key
+     * @param pk - primary key
      */
-    static destroy(): DeleteQueryBuilder;
+    static destroy(_pk?: any | any[]): Promise<void>;
     constructor(data?: any);
     /**
      * Fills model with data. It only fills properties that exists in database
      *
-     * @param data data to fill
+     * @param data - data to fill
      */
-    hydrate(data: any): void;
+    hydrate(data: Partial<this>): void;
     /**
      * Extracts all data from model. It takes only properties that exists in DB
      */
-    dehydrate(): {};
+    dehydrate(): Partial<this>;
     /**
      * deletes enitt from db. If model have SoftDelete decorator, model is marked as deleted
      */
     destroy(): Promise<void>;
+    update(): Promise<void>;
     /**
      * Save all changes to db. It creates new entry id db or updates existing one if
      * primary key exists
      */
-    save(insertBehaviour?: InsertBehaviour): Promise<void>;
+    insert(insertBehaviour?: InsertBehaviour): Promise<void>;
     /**
      * Gets model data from database and returns as fresh instance.
      */
-    fresh(): Promise<T>;
+    fresh(): Promise<this>;
     /**
      * sets default values for model. values are taken from DB default column prop
      */
-    protected defaults(): void;
+    protected setDefaults(): void;
 }
 export declare const MODEL_STATIC_MIXINS: {
     query(): SelectQueryBuilder;
     where(column: string | boolean | WhereFunction | RawQuery | {}, operator?: WhereOperators | any, value?: any): SelectQueryBuilder;
-    update(data: object): UpdateQueryBuilder;
+    update<T extends typeof ModelBase>(data: Partial<InstanceType<T>>): UpdateQueryBuilder;
     all(page: number, perPage: number): SelectQueryBuilder;
-    insertBulk<T>(data: (object | ModelBase<T>)[]): InsertQueryBuilder;
     /**
      * Try to insert new value
      */
-    insert<T_1>(data: object | ModelBase<T_1>): InsertQueryBuilder;
-    find(pks: any | any[]): Promise<any>;
-    findOrFail<T_2>(pks: any | any[]): Promise<T_2 | T_2[]>;
-    destroy(pks?: any | any[]): Promise<any> | DeleteQueryBuilder | UpdateQueryBuilder;
-    create(data?: any): Promise<any>;
-    firstOrCreate(data?: any): Promise<any>;
-    firstOrNew(data?: any): Promise<any>;
+    insert<T_1 extends typeof ModelBase>(this: T_1, data: InstanceType<T_1> | Partial<InstanceType<T_1>> | InstanceType<T_1>[] | Partial<InstanceType<T_1>>[]): InsertQueryBuilder;
+    find<T_2 extends typeof ModelBase>(this: T_2, pks: any[]): Promise<InstanceType<T_2>[]>;
+    findOrFail<T_3 extends typeof ModelBase>(this: T_3, pks: any[]): Promise<InstanceType<T_3>[]>;
+    get<T_4 extends typeof ModelBase>(this: T_4, pk: any): Promise<InstanceType<T_4>>;
+    getOrFail<T_5 extends typeof ModelBase>(this: T_5, pk: any): Promise<InstanceType<T_5>>;
+    destroy(pks: any | any[]): Promise<void>;
+    create<T_6 extends typeof ModelBase>(this: T_6, data: Partial<InstanceType<T_6>>): Promise<InstanceType<T_6>>;
+    getOrCreate<T_7 extends typeof ModelBase>(this: T_7, pk: any, data: Partial<InstanceType<T_7>>): Promise<InstanceType<T_7>>;
+    getOrNew<T_8 extends typeof ModelBase>(this: T_8, pk: any, data?: Partial<InstanceType<T_8>>): Promise<InstanceType<T_8>>;
 };

package/lib/model.js

@@ -1,25 +1,7 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MODEL_STATIC_MIXINS = exports.ModelBase = exports.extractModelDescriptor = void 0;
+/* eslint-disable prettier/prettier */
 const relations_1 = require("./relations");
 const decorators_1 = require("./decorators");
 const interfaces_1 = require("./interfaces");
@@ -27,10 +9,11 @@ const builders_1 = require("./builders");
 const di_1 = require("@spinajs/di");
 const orm_1 = require("./orm");
 const hydrators_1 = require("./hydrators");
-const _ = __importStar(require("lodash"));
+const _ = require("lodash");
 const uuid_1 = require("uuid");
+const exceptions_1 = require("./exceptions");
 function extractModelDescriptor(targetOrForward) {
-    const target = !di_1.isConstructor(targetOrForward) && targetOrForward ? targetOrForward() : targetOrForward;
+    const target = !(0, di_1.isConstructor)(targetOrForward) && targetOrForward ? targetOrForward() : targetOrForward;
     if (!target) {
         return null;
     }
@@ -82,51 +65,63 @@ class ModelBase {
         throw Error('Not implemented');
     }
     /**
-     * Inserts data to DB
+     * Inserts data to DB.
      *
-     * @param _data data to insert
+     * @param _data - data to insert
      */
     static insert(_data) {
         throw Error('Not implemented');
     }
     /**
-     * Inserts multiple data at once to DB
+     * Search entities in db
      *
-     * @param _data data to insert
+     * @param column - column to search or function
+     * @param operator - boolean operator
+     * @param value - value to compare
      */
-    static insertBulk(_data) {
+    static where(_column, _operator, _value) {
         throw Error('Not implemented');
     }
     /**
-     * Search entities in db
-     *
-     * @param column column to search or function
-     * @param operator boolean operator
-     * @param value value to compare
+     * Updates single or multiple records at once with provided value based on condition
      *
-     * @returns {SelectQueryBuilder} fluent query builder to add more conditions if needed
+     * @param _data - data to set
      */
-    static where(_column, _operator, _value) {
+    static update(_data) {
         throw Error('Not implemented');
     }
     /**
-     * Updates single or multiple records at once with provided value based on condition
+     * Tries to find all models with given primary keys
+     */
+    static find(_pks) {
+        throw Error('Not implemented');
+    }
+    /**
+     * Tries to find all models in db. If not all exists, throws exception
+     */
+    static findOrFail(_pks) {
+        throw Error('Not implemented');
+    }
+    /**
+     * gets model by specified pk, if not exists, returns null
      *
-     * @param _data data to set
      */
-    static update(_data) {
+    static get(_pk) {
         throw Error('Not implemented');
     }
-    // @ts-ignore
-    static find(pks) {
+    /**
+     * Finds model by specified pk. If model not exists in db throws exception
+     *
+     */
+    static getOrFail(_pk) {
         throw Error('Not implemented');
     }
     /**
-     * Finds model by specified pk
      *
-     * @param _pk pk to find
+     * Checks if model with pk key or unique fields exists and if not creates one AND NOT save in db
+     * NOTE: it checks for unique fields constraint
      */
-    static findOrFail(_pk) {
+    static getOrNew(_pk, _data) {
         throw Error('Not implemented');
     }
     /**
@@ -141,34 +136,29 @@ class ModelBase {
      * Checks if model with pk key / unique fields exists and if not creates one and saves to db
      * NOTE: it checks for unique fields too.
      *
-     * @param {any} data - model width data to check
+     * @param data - model width data to check
      */
-    static firstOrCreate(_pk, _data) {
+    static getOrCreate(_pk, _data) {
         throw Error('Not implemented');
     }
     /**
      * Creates new model & saves is to db
      *
-     * @param {any} data - initial model data
+     * @param  data - initial model data
      */
     static create(_data) {
         throw Error('Not implemented');
     }
     /**
+     * Deletes model from db
      *
-     * Checks if model with pk key or unique fields exists and if not creates one AND NOT save in db
-     * NOTE: it checks for unique fields constraint
-     *
-     * @param {any} data - model to check
+     * @param pk - primary key
      */
-    static firstOrNew(_data) {
-        throw Error('Not implemented');
-    }
     static destroy(_pk) {
         throw Error('Not implemented');
     }
     constructor(data) {
-        this.defaults();
+        this.setDefaults();
         if (data) {
             Object.assign(this, data);
         }
@@ -176,10 +166,10 @@ class ModelBase {
     /**
      * Fills model with data. It only fills properties that exists in database
      *
-     * @param data data to fill
+     * @param data - data to fill
      */
     hydrate(data) {
-        di_1.DI.resolve(Array.ofType(hydrators_1.ModelHydrator)).forEach(h => h.hydrate(this, data));
+        di_1.DI.resolve(Array.ofType(hydrators_1.ModelHydrator)).forEach((h) => h.hydrate(this, data));
     }
     /**
      * Extracts all data from model. It takes only properties that exists in DB
@@ -187,8 +177,11 @@ class ModelBase {
     dehydrate() {
         var _a;
         const obj = {};
-        (_a = this.ModelDescriptor.Columns) === null || _a === void 0 ? void 0 : _a.forEach(c => {
+        (_a = this.ModelDescriptor.Columns) === null || _a === void 0 ? void 0 : _a.forEach((c) => {
             const val = this[c.Name];
+            if (!c.Nullable && (val === null || val === undefined || val === '')) {
+                throw new exceptions_1.OrmException(`Field ${c.Name} cannot be null`);
+            }
             obj[c.Name] = c.Converter ? c.Converter.toDB(val) : val;
         });
         for (const [, val] of this.ModelDescriptor.Relations) {
@@ -209,62 +202,60 @@ class ModelBase {
         }
         await this.constructor.destroy(this.PrimaryKeyValue);
     }
+    async update() {
+        const { query } = _createQuery(this.constructor, builders_1.UpdateQueryBuilder);
+        if (this.ModelDescriptor.Timestamps.UpdatedAt) {
+            this[this.ModelDescriptor.Timestamps.UpdatedAt] = new Date();
+        }
+        await query.update(this.dehydrate()).where(this.PrimaryKeyName, this.PrimaryKeyValue);
+    }
     /**
      * Save all changes to db. It creates new entry id db or updates existing one if
      * primary key exists
      */
-    async save(insertBehaviour = interfaces_1.InsertBehaviour.None) {
+    async insert(insertBehaviour = interfaces_1.InsertBehaviour.None) {
         const self = this;
-        if (this.PrimaryKeyValue) {
-            const { query } = _createQuery(this.constructor, builders_1.UpdateQueryBuilder);
-            if (this.ModelDescriptor.Timestamps.UpdatedAt) {
-                this[this.ModelDescriptor.Timestamps.UpdatedAt] = new Date();
-            }
-            await query.update(this.dehydrate()).where(this.PrimaryKeyName, this.PrimaryKeyValue);
+        const { query, description } = _createQuery(this.constructor, builders_1.InsertQueryBuilder);
+        switch (insertBehaviour) {
+            case interfaces_1.InsertBehaviour.OnDuplicateIgnore:
+                query.ignore();
+                break;
+            case interfaces_1.InsertBehaviour.OnDuplicateUpdate:
+                query.onDuplicate().update(description.Columns.filter((c) => !c.PrimaryKey).map((c) => c.Name));
+                break;
+        }
+        const id = await query.values(this.dehydrate());
+        // ignore fired, we dont have insert ID
+        if (insertBehaviour !== interfaces_1.InsertBehaviour.None && id === 0 && !this.PrimaryKeyValue) {
+            const { query, description } = _createQuery(this.constructor, builders_1.SelectQueryBuilder, false);
+            const idRes = await query
+                .columns([this.PrimaryKeyName])
+                .where(function () {
+                description.Columns.filter((c) => c.Unique).forEach((c) => {
+                    this.where(c, self[c.Name]);
+                });
+            })
+                .first();
+            this.PrimaryKeyValue = idRes[this.PrimaryKeyName];
         }
         else {
-            const { query, description } = _createQuery(this.constructor, builders_1.InsertQueryBuilder);
-            switch (insertBehaviour) {
-                case interfaces_1.InsertBehaviour.OnDuplicateIgnore:
-                    query.ignore();
-                    break;
-                case interfaces_1.InsertBehaviour.OnDuplicateUpdate:
-                    query.onDuplicate().update(description.Columns.filter(c => !c.PrimaryKey).map(c => c.Name));
-                    break;
-            }
-            const id = await query.values(this.dehydrate());
-            // ignore fired, we dont have insert ID
-            if (insertBehaviour !== interfaces_1.InsertBehaviour.None && id === 0 && !this.PrimaryKeyValue) {
-                const { query, description } = _createQuery(this.constructor, builders_1.SelectQueryBuilder, false);
-                const idRes = await query
-                    .columns([this.PrimaryKeyName])
-                    .where(function () {
-                    description.Columns.filter(c => c.Unique).forEach(c => {
-                        this.where(c, self[c.Name]);
-                    });
-                })
-                    .first();
-                this.PrimaryKeyValue = idRes[this.PrimaryKeyName];
-            }
-            else {
-                this.PrimaryKeyValue = id;
-            }
+            this.PrimaryKeyValue = id;
         }
     }
     /**
      * Gets model data from database and returns as fresh instance.
      */
     async fresh() {
-        return this.constructor.find(this.PrimaryKeyValue);
+        return this.constructor.get(this.PrimaryKeyValue);
     }
     /**
      * sets default values for model. values are taken from DB default column prop
      */
-    defaults() {
+    setDefaults() {
         var _a;
-        (_a = this.ModelDescriptor.Columns) === null || _a === void 0 ? void 0 : _a.forEach(c => {
+        (_a = this.ModelDescriptor.Columns) === null || _a === void 0 ? void 0 : _a.forEach((c) => {
             if (c.Uuid) {
-                this[c.Name] = uuid_1.v4();
+                this[c.Name] = (0, uuid_1.v4)();
             }
             else {
                 this[c.Name] = c.DefaultValue;
@@ -329,31 +320,32 @@ exports.MODEL_STATIC_MIXINS = {
     },
     all(page, perPage) {
         const { query } = _createQuery(this, builders_1.SelectQueryBuilder);
-        query.select("*");
+        query.select('*');
         if (page >= 0 && perPage > 0) {
             query.take(perPage).skip(page * perPage);
         }
         return query;
     },
-    insertBulk(data) {
-        const { query } = _createQuery(this, builders_1.InsertQueryBuilder);
-        return query.values(data.map(d => {
-            if (d instanceof ModelBase) {
-                return d.dehydrate();
-            }
-            return d;
-        }));
-    },
     /**
      * Try to insert new value
      */
     insert(data) {
         const { query } = _createQuery(this, builders_1.InsertQueryBuilder);
-        if (data instanceof ModelBase) {
-            query.values(data.dehydrate());
+        if (Array.isArray(data)) {
+            query.values(data.map((d) => {
+                if (d instanceof ModelBase) {
+                    return d.dehydrate();
+                }
+                return d;
+            }));
         }
         else {
-            query.values(data);
+            if (data instanceof ModelBase) {
+                query.values(data.dehydrate());
+            }
+            else {
+                query.values(data);
+            }
         }
         return query;
     },
@@ -361,7 +353,8 @@ exports.MODEL_STATIC_MIXINS = {
         const { query, description } = _createQuery(this, builders_1.SelectQueryBuilder);
         const pkey = description.PrimaryKey;
         query.select('*');
-        return (await Array.isArray(pks)) ? query.whereIn(pkey, pks) : query.where(pkey, pks).first();
+        query.whereIn(pkey, pks);
+        return await query;
     },
     async findOrFail(pks) {
         const { query, description } = _createQuery(this, builders_1.SelectQueryBuilder);
@@ -380,80 +373,70 @@ exports.MODEL_STATIC_MIXINS = {
             async afterHydration(_data) { },
         };
         query.select('*');
-        if (Array.isArray(pks)) {
-            query.whereIn(pkey, pks);
-            query.middleware(middleware);
-            return await query;
-        }
-        else {
-            return await query.where(pkey, pks).firstOrFail();
-        }
+        query.whereIn(pkey, pks);
+        query.middleware(middleware);
+        return await query;
     },
-    destroy(pks) {
-        var _a, _b;
+    async get(pk) {
+        const { query, description } = _createQuery(this, builders_1.SelectQueryBuilder);
+        const pkey = description.PrimaryKey;
+        query.select('*');
+        query.where(pkey, pk);
+        return await query.first();
+    },
+    async getOrFail(pk) {
+        const { query, description } = _createQuery(this, builders_1.SelectQueryBuilder);
+        const pkey = description.PrimaryKey;
+        query.select('*');
+        query.where(pkey, pk);
+        return await query.firstOrFail();
+    },
+    async destroy(pks) {
+        var _a;
         const description = _descriptor(this);
         const orm = di_1.DI.get(orm_1.Orm);
         const driver = orm.Connections.get(description.Connection);
         const converter = driver.Container.resolve(interfaces_1.DatetimeValueConverter);
-        if (!pks) {
-            if ((_a = description.SoftDelete) === null || _a === void 0 ? void 0 : _a.DeletedAt) {
-                const { query } = _createQuery(this, builders_1.UpdateQueryBuilder);
-                query.update({
-                    [description.SoftDelete.DeletedAt]: converter.toDB(new Date()),
-                });
-                return query;
-            }
-            else {
-                const { query } = _createQuery(this, builders_1.DeleteQueryBuilder);
-                return query;
-            }
-        }
-        if ((_b = description.SoftDelete) === null || _b === void 0 ? void 0 : _b.DeletedAt) {
-            const data = Array.isArray(pks) ? pks : [pks];
+        const data = Array.isArray(pks) ? pks : [pks];
+        if ((_a = description.SoftDelete) === null || _a === void 0 ? void 0 : _a.DeletedAt) {
             const { query } = _createQuery(this, builders_1.UpdateQueryBuilder);
-            return query
-                .whereIn(description.PrimaryKey, data)
-                .update({
+            await query.whereIn(description.PrimaryKey, data).update({
                 [description.SoftDelete.DeletedAt]: converter.toDB(new Date()),
             });
         }
         else {
             const { query } = _createQuery(this, builders_1.DeleteQueryBuilder);
-            return query.whereIn(description.PrimaryKey, Array.isArray(pks) ? pks : [pks]);
+            await query.whereIn(description.PrimaryKey, data);
         }
     },
     async create(data) {
         const entity = new (Function.prototype.bind.apply(this))(data);
-        await entity.save();
+        await entity.insert();
         return entity;
     },
-    async firstOrCreate(data) {
+    async getOrCreate(pk, data) {
         const { query, description } = _createQuery(this, builders_1.SelectQueryBuilder);
         // pk constrain
-        if (data[description.PrimaryKey]) {
-            query.where(description.PrimaryKey, data[description.PrimaryKey]);
-        }
+        query.where(description.PrimaryKey, pk);
         // check for all unique columns ( unique constrain )
-        description.Columns.filter(c => c.Unique).forEach(c => {
-            query.orWhere(c, data[c.Name]);
+        description.Columns.filter((c) => c.Unique).forEach((c) => {
+            query.andWhere(c, data[c.Name]);
         });
         let entity = (await query.first());
         if (!entity) {
             entity = new (Function.prototype.bind.apply(this))(data);
-            await entity.save();
+            await entity.insert();
             return entity;
         }
         return entity;
     },
-    async firstOrNew(data) {
+    async getOrNew(pk, data) {
         const { query, description } = _createQuery(this, builders_1.SelectQueryBuilder);
         // pk constrain
-        if (data[description.PrimaryKey]) {
-            query.where(description.PrimaryKey, data[description.PrimaryKey]);
-        }
+        query.where(description.PrimaryKey, pk);
         // check for all unique columns ( unique constrain )
-        description.Columns.filter(c => c.Unique).forEach(c => {
-            query.orWhere(c, data[c.Name]);
+        description.Columns.filter((c) => c.Unique).forEach((c) => {
+            query.andWhere(c, data[c.Name]);
         });
         let entity = (await query.first());
         if (!entity) {