@dnax/core 0.40.2 → 0.41.0

package/driver/mongo/rest.ts

@@ -1077,6 +1077,120 @@ class useRest {
     });
   }
 
+  async findAndUpdate(
+    collection: string,
+    filter: object,
+    update: updateParams,
+    options?: optionCb
+  ): Promise<object> {
+    return new Promise(async (resolve, reject) => {
+      try {
+        let result = {
+          doc: null,
+        };
+        let col = getCollection(collection, this.#tenant_id);
+        if (!col) return fn.error(`Collection ${collection} not found`, 404);
+        update = toJson(update);
+        let sharedData = {};
+        let useHook = options?.useHook ?? this.#useHook;
+        if (col?.hooks?.beforeOperation && useHook) {
+          await col.hooks.beforeOperation({
+            sharedData: sharedData,
+            filter: filter || {},
+            c: this.#c,
+            error: fn.error,
+            io: Cfg.io,
+            driver: "mongodb",
+            action: "findAndUpdate",
+            update: update,
+            session: sessionStorage(),
+            rest: new useRest({
+              useHook: false,
+              tenant_id: this.#tenant_id,
+            }),
+          });
+        }
+
+        if (col?.hooks?.beforeUpdate && useHook) {
+          await col.hooks.beforeUpdate({
+            sharedData: sharedData,
+            c: this.#c,
+            filter: filter || {},
+            driver: "mongodb",
+            io: Cfg.io,
+            action: "findAndUpdate",
+            update: update,
+            session: sessionStorage(),
+            rest: new useRest({
+              useHook: false,
+              tenant_id: this.#tenant_id,
+            }),
+          });
+        }
+
+        //@ts-expect-error
+        update = omit(update, omitUpdate);
+        if (update.$set) {
+          //  update.$set = deepSetId(col, update.$set);
+          update.$set = deepSetId(col, update.$set);
+          update.$set = transformAllDate(update.$set);
+          update.$set = await hashPasswordAuto(update.$set, col);
+          var { valid, output, error } = this.validator(
+            collection,
+            update.$set,
+            {
+              partial: true,
+            }
+          );
+          //  update.$set = output;
+          if (!valid) fn.error(error, 400);
+        }
+
+        result.doc = await this.#tenant.database.db
+          ?.collection(collection)
+          .updateMany(
+            {
+              ...(formatData(filter) || {}),
+            },
+            {
+              ...formatData(omit(update, omitUpdate), {
+                collection: collection,
+                tenant_id: this.#tenant_id,
+              }),
+              $currentDate: {
+                updatedAt: true,
+              },
+            },
+            {
+              session: this.#session ? this.#session : undefined,
+            }
+          );
+
+        if (col?.hooks?.afterUpdate && useHook) {
+          await col.hooks.afterUpdate({
+            sharedData: sharedData,
+            c: this.#c,
+            driver: "mongodb",
+            filter: filter,
+            action: "findAndUpdate",
+            update: update,
+            session: sessionStorage(),
+            result: result.doc,
+            io: Cfg.io,
+            rest: new useRest({
+              useHook: false,
+              tenant_id: this.#tenant_id,
+            }),
+          });
+        }
+
+        return resolve(result.doc);
+      } catch (err) {
+        return reject(err);
+      }
+    });
+  }
+
   async findOneAndUpdate(
     collection: string,
     filter: object,
@@ -1176,7 +1290,7 @@ class useRest {
             c: this.#c,
             driver: "mongodb",
             filter: filter,
-            action: "updateOne",
+            action: "findOneAndUpdate",
             update: update,
             session: sessionStorage(),
             result: result.doc,

package/package.json

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

package/types/index.ts

@@ -42,6 +42,7 @@ export type Tenant = {
   };
 };
 export type Actions =
+  | "findAndUpdate"
   | "findOneAndUpdate"
   | "find"
   | "findOne"