@dnax/core 0.73.3 → 0.73.5

package/driver/mongo/rest.ts

@@ -1637,6 +1637,14 @@ 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);
+
         let up_ = await this.#tenant.database.db
           ?.collection(collection)
           .updateMany(
@@ -1653,10 +1661,11 @@ class useRest {
               },
               $setOnInsert: {
                 createdAt: new Date(),
-                ...formatData(update?.$setOnInsert || {}, {
+                ...formatData($setOnInsert || {}, {
                   collection: collection,
                   tenant_id: this.#tenant_id,
                   action: "updateMany",
+                  upsert: true,
                 }),
               },
             },
@@ -1802,6 +1811,14 @@ 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);
+
         result.doc = await this.#tenant.database.db
           ?.collection(collection)
           .findOneAndUpdate(
@@ -1813,15 +1830,16 @@ class useRest {
                 collection: collection,
                 tenant_id: this.#tenant_id,
               }),
+
               $setOnInsert: {
-                ...formatData(update?.$setOnInsert || {}, {
+                ...formatData($setOnInsert || {}, {
                   collection: collection,
                   tenant_id: this.#tenant_id,
                   action: "insertOne",
+                  upsert: true,
                 }),
-                //updatedAt: new Date(),
-                createdAt: new Date(),
               },
+
               $currentDate: {
                 updatedAt: true,
               },

package/driver/mongo/utils.ts

@@ -188,6 +188,7 @@ function transformAllDate(data: object) {
 function toBson<T>(
   data: object | T,
   options?: {
+    upsert?: boolean;
     action?:
       | "insertOne"
       | "insertMany"
@@ -204,14 +205,14 @@ function toBson<T>(
     // InsertOne
     if (options?.action == "insertOne") {
       data.createdAt = new Date();
-      data.updatedAt = new Date();
+      if (!options?.upsert) data.updatedAt = new Date();
     }
 
     // insertMany
     if (options?.action == "insertMany" && Array.isArray(data)) {
       data?.map((d) => {
         d.createdAt = new Date();
-        d.updatedAt = new Date();
+        if (!options?.upsert) d.updatedAt = new Date();
       });
     }
 
@@ -414,6 +415,7 @@ function formatData(
     collection?: string;
     action?: Actions;
     tenant_id: string;
+    upsert?: boolean;
   } = {
     tenant_id: "_",
     collection: "",
@@ -424,6 +426,7 @@ function formatData(
     data = deepSetId(col, data);
   }
   data = toBson(data, {
+    upsert: options?.upsert,
     action: options?.action,
   });
 

package/package.json

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