@webtypen/webframez-core 0.2.33 → 0.2.35

package/dist/DataBuilder/DataBuilder.d.ts

@@ -50,6 +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>;
     typeForFrontend(type: any, req: any): Promise<any>;
     loadType(req: Request): Promise<{
         status: string;

package/dist/DataBuilder/DataBuilder.js

@@ -126,12 +126,12 @@ class DataBuilder {
                 if (fields[key].unique) {
                     let isUnique = false;
                     if (typeof fields[key].unique === "function") {
-                        yield fields[key].unique(req.body.data, req);
+                        isUnique = yield fields[key].unique(req.body.data, req);
                     }
-                    else {
-                        throw new Error("Missing unique-function ...");
+                    else if (typeof fields[key].unique === "object") {
+                        isUnique = yield this.handleUnique(db, req, fields[key], type);
                     }
-                    if (isUnique) {
+                    if (!isUnique) {
                         errors[fieldPath] = "Es gibt bereits einen anderen Datensatz mit diesem Wert.";
                         continue;
                     }
@@ -151,6 +151,40 @@ class DataBuilder {
             return errors;
         });
     }
+    handleUnique(db, req, field, type) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const match = 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
+                : type.collection)
+                .aggregate([
+                { $match: match },
+                ...(typeof field.unique.aggregation === "function"
+                    ? yield field.aggregation(req)
+                    : field.aggregation && Array.isArray(field.aggregation)
+                        ? field.aggregation
+                        : []),
+            ])
+                .toArray();
+            if (!check || check.length < 1) {
+                return true;
+            }
+            if (!req.body.__builder_id || req.body.__builder_id === "new") {
+                return false;
+            }
+            for (let el of check) {
+                if (el && el._id && el._id.toString() !== req.body.__builder_id) {
+                    return true;
+                }
+            }
+            return true;
+        });
+    }
     typeForFrontend(type, req) {
         return __awaiter(this, void 0, void 0, function* () {
             const newData = {};

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@webtypen/webframez-core",
-    "version": "0.2.33",
+    "version": "0.2.35",
     "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

@@ -171,12 +171,12 @@ export class DataBuilder {
             if (fields[key].unique) {
                 let isUnique = false;
                 if (typeof fields[key].unique === "function") {
-                    await fields[key].unique(req.body.data, req);
-                } else {
-                    throw new Error("Missing 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);
                 }
 
-                if (isUnique) {
+                if (!isUnique) {
                     errors[fieldPath] = "Es gibt bereits einen anderen Datensatz mit diesem Wert.";
                     continue;
                 }
@@ -199,6 +199,45 @@ export class DataBuilder {
         return errors;
     }
 
+    async handleUnique(db: any, req: any, field: any, type: any) {
+        const match: any =
+            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() !== ""
+                    ? field.unique.collection
+                    : type.collection
+            )
+            .aggregate([
+                { $match: match },
+                ...(typeof field.unique.aggregation === "function"
+                    ? await field.aggregation(req)
+                    : field.aggregation && Array.isArray(field.aggregation)
+                    ? field.aggregation
+                    : []),
+            ])
+            .toArray();
+
+        if (!check || check.length < 1) {
+            return true;
+        }
+
+        if (!req.body.__builder_id || req.body.__builder_id === "new") {
+            return false;
+        }
+
+        for (let el of check) {
+            if (el && el._id && el._id.toString() !== req.body.__builder_id) {
+                return true;
+            }
+        }
+        return true;
+    }
+
     async typeForFrontend(type: any, req: any) {
         const newData: any = {};
         for (let key in type) {