@dnax/core 0.73.4 → 0.73.7

package/driver/mongo/rest.ts

@@ -37,6 +37,7 @@ import {
   transformAllDate,
   deepSetId,
   setUUID,
+  setDefaultValue,
 } from "./utils";
 import { Cfg } from "../../config";
 import cleanDeep from "clean-deep";
@@ -497,6 +498,7 @@ class useRest {
         data = await hashPasswordAuto(data, col);
         data = transformAllDate(data);
         data = deepSetId(col, data);
+        data = setDefaultValue(data, col, "insertOne");
         data = omit(
           data,
           ["_id", "createdAt", "updatedAt"].concat(disableReadOnlyFields)
@@ -678,6 +680,7 @@ class useRest {
           d = await setUUID(d, col);
           d = await randomCode(d, col);
           d = await hashPasswordAuto(d, col);
+          d = setDefaultValue(d, col, "insertOne");
           d = omit(
             d,
             ["_id", "createdAt", "updatedAt"].concat(disableReadOnlyFields)
@@ -1637,6 +1640,15 @@ class useRest {
           if (!valid) fn.error(error, 400);
         }
 
+        let $setOnInsert = update.$setOnInsert || {};
+        // Processing before validation
+        $setOnInsert = await setUUID($setOnInsert, col);
+        $setOnInsert = await randomCode($setOnInsert, col);
+        $setOnInsert = await hashPasswordAuto($setOnInsert, col);
+        $setOnInsert = transformAllDate($setOnInsert);
+        $setOnInsert = deepSetId(col, $setOnInsert);
+        $setOnInsert = setDefaultValue($setOnInsert, col, "insertOne");
+
         let up_ = await this.#tenant.database.db
           ?.collection(collection)
           .updateMany(
@@ -1653,7 +1665,7 @@ class useRest {
               },
               $setOnInsert: {
                 createdAt: new Date(),
-                ...formatData(update?.$setOnInsert || {}, {
+                ...formatData($setOnInsert || {}, {
                   collection: collection,
                   tenant_id: this.#tenant_id,
                   action: "updateMany",
@@ -1803,6 +1815,15 @@ class useRest {
           if (!valid) fn.error(error, 400);
         }
 
+        let $setOnInsert = update.$setOnInsert || {};
+        // Processing before validation
+        $setOnInsert = await setUUID($setOnInsert, col);
+        $setOnInsert = await randomCode($setOnInsert, col);
+        $setOnInsert = await hashPasswordAuto($setOnInsert, col);
+        $setOnInsert = transformAllDate($setOnInsert);
+        $setOnInsert = deepSetId(col, $setOnInsert);
+        $setOnInsert = setDefaultValue($setOnInsert, col, "insertOne");
+
         result.doc = await this.#tenant.database.db
           ?.collection(collection)
           .findOneAndUpdate(
@@ -1816,7 +1837,7 @@ class useRest {
               }),
 
               $setOnInsert: {
-                ...formatData(update?.$setOnInsert || {}, {
+                ...formatData($setOnInsert || {}, {
                   collection: collection,
                   tenant_id: this.#tenant_id,
                   action: "insertOne",

package/driver/mongo/utils.ts

@@ -409,6 +409,30 @@ async function setUUID(
   return data;
 }
 
+function setDefaultValue(data: any, col: Collection, action?: Actions) {
+  col?.fields?.map((f) => {
+    if (
+      f?.defaultValue &&
+      !data?.hasOwnProperty(f?.name) &&
+      action == "insertOne"
+    ) {
+      data[f?.name] = f?.defaultValue;
+    }
+    if (
+      f?.defaultValue &&
+      !data?.hasOwnProperty(f?.name) &&
+      action == "insertMany"
+    ) {
+      data.map((d) => {
+        if (!d?.hasOwnProperty(f?.name)) {
+          d[f?.name] = f?.defaultValue;
+        }
+      });
+    }
+  });
+  return data;
+}
+
 function formatData(
   data: any,
   options: {
@@ -422,8 +446,28 @@ function formatData(
   }
 ) {
   let col = getCollection(options.collection, options?.tenant_id);
+
   if (col) {
     data = deepSetId(col, data);
+    if (options?.action == "insertOne") {
+      col?.fields?.map((f) => {
+        if (f?.defaultValue && !data?.hasOwnProperty(f?.name)) {
+          data[f?.name] = f?.defaultValue;
+        }
+      });
+    }
+
+    if (options?.action == "insertMany") {
+      col?.fields?.map((f) => {
+        if (f?.defaultValue) {
+          data.map((d) => {
+            if (!d?.hasOwnProperty(f?.name)) {
+              d[f?.name] = f?.defaultValue;
+            }
+          });
+        }
+      });
+    }
   }
   data = toBson(data, {
     upsert: options?.upsert,
@@ -460,4 +504,5 @@ export {
   hashPasswordAuto,
   transformAllDate,
   setUUID,
+  setDefaultValue,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dnax/core",
-  "version": "0.73.4",
+  "version": "0.73.7",
   "module": "index.ts",
   "type": "module",
   "bin": {},