@webtypen/webframez-core 0.2.30 → 0.2.32

package/dist/DataBuilder/DataBuilder.d.ts

@@ -6,6 +6,8 @@ export type DataBuilderSchema = {
     primaryKeyPlain?: boolean;
     beforeSave?: any;
     afterSave?: any;
+    beforeDelete?: any;
+    afterDelete?: any;
     getAggregation?: any;
     events?: {
         [key: string]: any;
@@ -70,6 +72,18 @@ export declare class DataBuilder {
         };
         errors?: undefined;
     }>;
+    delete(db: any, req: any): Promise<{
+        status: string;
+        errors: any;
+        data?: undefined;
+    } | {
+        status: string;
+        data: {
+            _id: any;
+            redirect: any;
+        };
+        errors?: undefined;
+    }>;
     getField(req: Request, type: DataBuilderType, path: string): Promise<any>;
     removeArrayIndicators(str: string): string;
     details(db: any, req: any): Promise<{

package/dist/DataBuilder/DataBuilder.js

@@ -216,7 +216,15 @@ class DataBuilder {
                 }
                 else {
                     let elementVal = null;
-                    if (value !== undefined &&
+                    if (fields[key].type === "ObjectId") {
+                        if (value && (value.toString().length === 12 || value.toString().length === 24)) {
+                            elementVal = typeof value === "string" ? yield Model_1.Model.objectId(value) : value;
+                        }
+                        else {
+                            elementVal = yield Model_1.Model.objectId();
+                        }
+                    }
+                    else if (value !== undefined &&
                         value !== null &&
                         !(typeof value === "string" && value.trim() === "") &&
                         !(typeof value === "number" && value.toString().trim() === "")) {
@@ -238,19 +246,6 @@ class DataBuilder {
                         }
                     }
                     lodash_1.default.set(element, fieldPath, elementVal);
-                    // lodash.set(
-                    //     element,
-                    //     fieldPath,
-                    //     value === undefined || value === null || (typeof value === "string" && value.trim() === "")
-                    //         ? null
-                    //         : customType && typeof customType.onSave === "function"
-                    //         ? await customType.onSave(value, { ...payload, ...fields[key].payload })
-                    //         : fields[key].type === "currency" || fields[key].type === "float"
-                    //         ? parseFloat(value.toString().replace(",", "."))
-                    //         : fields[key].type === "integer"
-                    //         ? parseInt(value)
-                    //         : value
-                    // );
                 }
             }
             return element;
@@ -380,6 +375,83 @@ class DataBuilder {
             };
         });
     }
+    delete(db, req) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!req || !req.body || typeof req.body !== "object" || !req.body.__builder_id || req.body.__builder_id.toString().trim() === "") {
+                throw new Error("Missing id ...");
+            }
+            if (typeof req.body.data !== "object") {
+                throw new Error("Missing id ...");
+            }
+            const type = this.getTypeFromRequest(req.body);
+            if (!type || !type.schema || !type.schema.fields) {
+                throw new Error("Missing schema fields ...");
+            }
+            const schemaFields = typeof type.schema.fields === "function" ? yield type.schema.fields(req) : type.schema.fields;
+            const errors = yield this.validateFields(schemaFields, req.body.data);
+            if (errors && Object.keys(errors).length > 0) {
+                return {
+                    status: "error",
+                    errors: errors,
+                };
+            }
+            const collection = type.schema && type.schema.collection ? type.schema.collection : undefined;
+            if (!collection || collection.trim() === "") {
+                throw new Error("Missing collection ...");
+            }
+            let element = null;
+            if (req.body.__builder_id === "new") {
+                throw new Error("Cannot delete a new object ...");
+            }
+            else {
+                const result = yield db
+                    .collection(collection)
+                    .aggregate(type.schema && typeof type.schema.getAggregation === "function"
+                    ? yield type.schema.getAggregation(yield this.getAggregation(type, req), req)
+                    : yield this.getAggregation(type, req), collection)
+                    .toArray();
+                if (!result || !result[0] || !result[0][type.schema.primaryKey ? type.schema.primaryKey : "_id"]) {
+                    throw new Error("Element '" + req.body.__builder_id + "' not found ...");
+                }
+                element = result[0];
+            }
+            if (!element || !element._id) {
+                throw new Error("Element '" + req.body.__builder_id + "' not found ...");
+            }
+            try {
+                if (typeof type.schema.beforeDelete === "function") {
+                    yield type.schema.beforeDelete(element, req);
+                }
+            }
+            catch (e) {
+                throw e;
+            }
+            yield db.collection(collection).deleteOne({ _id: element._id });
+            try {
+                if (typeof type.schema.afterDelete === "function") {
+                    yield type.schema.afterDelete(element, req);
+                }
+            }
+            catch (e) {
+                throw e;
+            }
+            let redirect = undefined;
+            const forms = typeof type.forms === "function" ? yield type.forms(req) : type.forms;
+            if (forms && forms.main && forms.main.onDeleteRedirect && typeof forms.main.onDeleteRedirect === "function") {
+                redirect = yield forms.main.onDeleteRedirect(element, req);
+            }
+            else if (forms && forms.main && forms.main.onSaveRedirect && typeof forms.main.onSaveRedirect === "function") {
+                redirect = yield forms.main.onSaveRedirect(element, req);
+            }
+            return {
+                status: "success",
+                data: {
+                    _id: element._id,
+                    redirect: redirect,
+                },
+            };
+        });
+    }
     getField(req, type, path) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!path || path.trim() === "") {

package/dist/DataBuilder/DataBuilderController.js

@@ -33,6 +33,9 @@ class DataBuilderController extends Controller_1.Controller {
             else if (req.body.__builder_rest_api === "save") {
                 return res.send(yield this.builder.save(db.client.db(null), req));
             }
+            else if (req.body.__builder_rest_api === "delete") {
+                return res.send(yield this.builder.delete(db.client.db(null), req));
+            }
             else if (req.body.__builder_rest_api === "type") {
                 return res.send(yield this.builder.loadType(req));
             }

package/package.json

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

@@ -9,6 +9,8 @@ export type DataBuilderSchema = {
     primaryKeyPlain?: boolean;
     beforeSave?: any;
     afterSave?: any;
+    beforeDelete?: any;
+    afterDelete?: any;
     getAggregation?: any;
     events?: { [key: string]: any };
     fields: { [key: string]: any };
@@ -279,7 +281,13 @@ export class DataBuilder {
                 }
             } else {
                 let elementVal = null;
-                if (
+                if (fields[key].type === "ObjectId") {
+                    if (value && (value.toString().length === 12 || value.toString().length === 24)) {
+                        elementVal = typeof value === "string" ? await Model.objectId(value) : value;
+                    } else {
+                        elementVal = await Model.objectId();
+                    }
+                } else if (
                     value !== undefined &&
                     value !== null &&
                     !(typeof value === "string" && value.trim() === "") &&
@@ -307,19 +315,6 @@ export class DataBuilder {
                 }
 
                 lodash.set(element, fieldPath, elementVal);
-                // lodash.set(
-                //     element,
-                //     fieldPath,
-                //     value === undefined || value === null || (typeof value === "string" && value.trim() === "")
-                //         ? null
-                //         : customType && typeof customType.onSave === "function"
-                //         ? await customType.onSave(value, { ...payload, ...fields[key].payload })
-                //         : fields[key].type === "currency" || fields[key].type === "float"
-                //         ? parseFloat(value.toString().replace(",", "."))
-                //         : fields[key].type === "integer"
-                //         ? parseInt(value)
-                //         : value
-                // );
             }
         }
 
@@ -464,6 +459,93 @@ export class DataBuilder {
         };
     }
 
+    async delete(db: any, req: any) {
+        if (!req || !req.body || typeof req.body !== "object" || !req.body.__builder_id || req.body.__builder_id.toString().trim() === "") {
+            throw new Error("Missing id ...");
+        }
+
+        if (typeof req.body.data !== "object") {
+            throw new Error("Missing id ...");
+        }
+
+        const type = this.getTypeFromRequest(req.body);
+        if (!type || !type.schema || !type.schema.fields) {
+            throw new Error("Missing schema fields ...");
+        }
+
+        const schemaFields = typeof type.schema.fields === "function" ? await type.schema.fields(req) : type.schema.fields;
+        const errors: any = await this.validateFields(schemaFields, req.body.data);
+        if (errors && Object.keys(errors).length > 0) {
+            return {
+                status: "error",
+                errors: errors,
+            };
+        }
+
+        const collection = type.schema && type.schema.collection ? type.schema.collection : undefined;
+        if (!collection || collection.trim() === "") {
+            throw new Error("Missing collection ...");
+        }
+
+        let element: any = null;
+        if (req.body.__builder_id === "new") {
+            throw new Error("Cannot delete a new object ...");
+        } else {
+            const result = await db
+                .collection(collection)
+                .aggregate(
+                    type.schema && typeof type.schema.getAggregation === "function"
+                        ? await type.schema.getAggregation(await this.getAggregation(type, req), req)
+                        : await this.getAggregation(type, req),
+                    collection
+                )
+                .toArray();
+
+            if (!result || !result[0] || !result[0][type.schema.primaryKey ? type.schema.primaryKey : "_id"]) {
+                throw new Error("Element '" + req.body.__builder_id + "' not found ...");
+            }
+            element = result[0];
+        }
+
+        if (!element || !element._id) {
+            throw new Error("Element '" + req.body.__builder_id + "' not found ...");
+        }
+
+        try {
+            if (typeof type.schema.beforeDelete === "function") {
+                await type.schema.beforeDelete(element, req);
+            }
+        } catch (e: any) {
+            throw e;
+        }
+
+        await db.collection(collection).deleteOne({ _id: element._id });
+
+        try {
+            if (typeof type.schema.afterDelete === "function") {
+                await type.schema.afterDelete(element, req);
+            }
+        } catch (e: any) {
+            throw e;
+        }
+
+        let redirect: any = undefined;
+        const forms = typeof type.forms === "function" ? await type.forms(req) : type.forms;
+        if (forms && forms.main && forms.main.onDeleteRedirect && typeof forms.main.onDeleteRedirect === "function") {
+            redirect = await forms.main.onDeleteRedirect(element, req);
+        } else if (forms && forms.main && forms.main.onSaveRedirect && typeof forms.main.onSaveRedirect === "function") {
+            redirect = await forms.main.onSaveRedirect(element, req);
+        }
+
+        return {
+            status: "success",
+            data: {
+                _id: element._id,
+                redirect: redirect,
+            },
+        };
+    }
+
     async getField(req: Request, type: DataBuilderType, path: string) {
         if (!path || path.trim() === "") {
             return null;

package/src/DataBuilder/DataBuilderController.ts

@@ -22,6 +22,8 @@ export class DataBuilderController extends Controller {
             return res.send(await this.builder.detailsNewData(db.client.db(null), req));
         } else if (req.body.__builder_rest_api === "save") {
             return res.send(await this.builder.save(db.client.db(null), req));
+        } else if (req.body.__builder_rest_api === "delete") {
+            return res.send(await this.builder.delete(db.client.db(null), req));
         } else if (req.body.__builder_rest_api === "type") {
             return res.send(await this.builder.loadType(req));
         }