@webtypen/webframez-core 0.2.34 → 0.2.36

package/dist/DataBuilder/DataBuilder.d.ts

@@ -50,7 +50,7 @@ export declare class DataBuilder {
     getFieldsFrontend(fields: any, payload?: any): Promise<any>;
     getTypeFromRequest(req: any): DataBuilderType;
     validateFields(db: any, type: any, fields: any, req: Request, errors?: any, path?: string): Promise<any>;
-    handleUnique(db: any, req: any, field: any, type: any): Promise<boolean>;
+    handleUnique(db: any, req: any, key: string, value: any, field: any, type: any): Promise<boolean>;
     typeForFrontend(type: any, req: any): Promise<any>;
     loadType(req: Request): Promise<{
         status: string;

package/dist/DataBuilder/DataBuilder.js

@@ -123,15 +123,15 @@ class DataBuilder {
                     }
                 }
                 // Check-Unique
-                if (fields[key].unique) {
+                if (value !== null && value !== false && value !== undefined && fields[key].unique) {
                     let isUnique = false;
                     if (typeof fields[key].unique === "function") {
                         isUnique = yield fields[key].unique(req.body.data, req);
                     }
                     else if (typeof fields[key].unique === "object") {
-                        isUnique = yield this.handleUnique(db, req, fields[key], type);
+                        isUnique = yield this.handleUnique(db, req, key, value, fields[key], type);
                     }
-                    if (isUnique) {
+                    if (!isUnique) {
                         errors[fieldPath] = "Es gibt bereits einen anderen Datensatz mit diesem Wert.";
                         continue;
                     }
@@ -151,13 +151,13 @@ class DataBuilder {
             return errors;
         });
     }
-    handleUnique(db, req, field, type) {
+    handleUnique(db, req, key, value, field, type) {
         return __awaiter(this, void 0, void 0, function* () {
-            const match = typeof field.unique.match === "function"
+            const match = Object.assign({ [key]: value }, (typeof field.unique.match === "function"
                 ? yield field.unique.match(req)
                 : typeof field.unique.match === "object"
                     ? field.unique.match
-                    : {};
+                    : {}));
             const check = yield db
                 .collection(typeof field.unique.collection === "string" && field.unique.collection.trim() !== ""
                 ? field.unique.collection

package/package.json

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

package/src/DataBuilder/DataBuilder.ts

@@ -168,15 +168,15 @@ export class DataBuilder {
             }
 
             // Check-Unique
-            if (fields[key].unique) {
+            if (value !== null && value !== false && value !== undefined && fields[key].unique) {
                 let isUnique = false;
                 if (typeof fields[key].unique === "function") {
                     isUnique = await fields[key].unique(req.body.data, req);
                 } else if (typeof fields[key].unique === "object") {
-                    isUnique = await this.handleUnique(db, req, fields[key], type);
+                    isUnique = await this.handleUnique(db, req, key, value, fields[key], type);
                 }
 
-                if (isUnique) {
+                if (!isUnique) {
                     errors[fieldPath] = "Es gibt bereits einen anderen Datensatz mit diesem Wert.";
                     continue;
                 }
@@ -199,13 +199,15 @@ export class DataBuilder {
         return errors;
     }
 
-    async handleUnique(db: any, req: any, field: any, type: any) {
-        const match: any =
-            typeof field.unique.match === "function"
+    async handleUnique(db: any, req: any, key: string, value: any, field: any, type: any) {
+        const match: any = {
+            [key]: value,
+            ...(typeof field.unique.match === "function"
                 ? await field.unique.match(req)
                 : typeof field.unique.match === "object"
                 ? field.unique.match
-                : {};
+                : {}),
+        };
         const check = await db
             .collection(
                 typeof field.unique.collection === "string" && field.unique.collection.trim() !== ""