@dnax/core 0.77.3 → 0.77.5

package/driver/mongo/@types.ts

@@ -88,3 +88,17 @@ export type bulkUpdateOperations = Array<{
     update: updateParams;
   };
 }>;
+
+export type bulkOperations = Array<{
+  updateOne?: {
+    filter?: object;
+    update: updateParams;
+  };
+  updateMany?: {
+    filter?: object;
+    update: updateParams;
+  };
+  insertOne?: {
+    document: object;
+  };
+}>;

package/driver/mongo/rest.ts

@@ -18,7 +18,6 @@ import {
 import { contextError, fn, toJson, dotJson, getEntryBykeys } from "../../utils";
 import v, { type Schema } from "joi";
 import type { Context } from "hono";
-import type { SearchParams } from "meilisearch";
 
 import type {
   findOneParam,
@@ -27,6 +26,7 @@ import type {
   restEventType,
   updateParams,
   bulkUpdateOperations,
+  bulkOperations,
 } from "./@types";
 import {
   buildPipeline,
@@ -143,9 +143,6 @@ class useRest {
       }
     ) => Promise<Array<any>>;
   };
-  meilisearch: {
-    client: InstanceType<typeof MeiliSearch>;
-  };
 
   constructor(options: options) {
     this.#useValidator = true;
@@ -156,9 +153,7 @@ class useRest {
     this.#tenant = getTenant(this.#tenant_id);
     this.#useHook = options?.useHook ?? true;
     this.db = this.#tenant.database.db;
-    this.meilisearch = {
-      client: this.#tenant.searchEngine?.meilisearch?.client!,
-    };
+
     this.activity = {
       aggregate: async (
         pipeline: Array<object>,
@@ -2058,6 +2053,194 @@ class useRest {
     });
   }
 
+  async bulkWrite(
+    collection: string,
+    operations: bulkOperations,
+    options?: Omit<optionCb, "withMeta" | "elementAt"> & {
+      disableReadOnlyFields?: string[];
+    }
+  ): Promise<any | typeof fn.error> {
+    return new Promise(async (resolve, reject) => {
+      try {
+        let col = getCollection(collection, this.#tenant_id);
+        if (!col) return fn.error(`Collection ${collection} not found`, 404);
+
+        // controle operations
+        for (const operation of operations) {
+          if (!operation) return fn.error(`Operation required`, 400);
+        }
+        let disableReadOnlyFields = omit(
+          col?.api?.fields?.readOnly || [],
+          options?.disableReadOnlyFields || []
+        ) as string[];
+
+        // obtenir toutes les keys de operations
+        let keys = Object.keys(operations);
+
+        // controle si les keys sont valides
+        for (const key of keys) {
+          if (!["updateOne", "updateMany", "insertOne"].includes(key)) {
+            return fn.error(`Invalid key ${key} for bulk write`, 400);
+          }
+        }
+
+        // controle des elements requis pour chaque operation
+        for (const operation of operations) {
+          if (operation?.updateOne) {
+            if (!operation.updateOne?.filter) {
+              return fn.error(`Filter required`, 400);
+            }
+          }
+          if (operation?.updateMany) {
+            if (!operation.updateMany?.filter) {
+              return fn.error(`Filter required`, 400);
+            }
+          }
+
+          if (operation?.insertOne) {
+            if (!operation.insertOne?.document) {
+              return fn.error(`Document required`, 400);
+            }
+          }
+        }
+
+        // formatage des data des operations
+        for (const operation of operations) {
+          if (operation?.updateOne || operation?.updateMany) {
+            let operationInstance = operation.updateOne || operation.updateMany;
+
+            if (operationInstance?.filter) {
+              operationInstance.filter = formatData(operationInstance.filter);
+            }
+            if (operationInstance?.update?.$set) {
+              operationInstance.update.$set = deepSetId(
+                col,
+                omit(operationInstance.update.$set, [
+                  "createdAt",
+                  "updatedAt",
+                  "_id",
+                ])
+              );
+              operationInstance.update.$set = transformAllDate(
+                operationInstance.update.$set
+              );
+              operationInstance.update.$set = await hashPasswordAuto(
+                operationInstance.update.$set,
+                col
+              );
+              operationInstance.update.$currentDate = {
+                updatedAt: true,
+              };
+              operationInstance.update.$set = formatData(
+                operationInstance.update.$set,
+                {
+                  collection: collection,
+                  tenant_id: this.#tenant_id,
+                  action: "updateOne",
+                }
+              );
+              var { valid, output, error } = this.validator(
+                collection,
+                dotJson.object(operationInstance.update.$set),
+                {
+                  partial: true,
+                }
+              );
+              if (!valid) fn.error(error, 400);
+            }
+          }
+
+          if (operation?.insertOne) {
+            operation.insertOne.document = await setUUID(
+              operation.insertOne.document,
+              col
+            );
+            operation.insertOne.document = await randomCode(
+              operation.insertOne.document,
+              col
+            );
+            operation.insertOne.document = await hashPasswordAuto(
+              operation.insertOne.document,
+              col
+            );
+            operation.insertOne.document = transformAllDate(
+              operation.insertOne.document
+            );
+            operation.insertOne.document = deepSetId(
+              col,
+              operation.insertOne.document
+            );
+            operation.insertOne.document = setDefaultValue(
+              operation.insertOne.document,
+              col,
+              "insertOne"
+            );
+            operation.insertOne.document = omit(
+              operation.insertOne.document,
+              ["_id", "createdAt", "updatedAt"].concat(disableReadOnlyFields)
+            );
+
+            var { valid, output, error } = this.validator(
+              collection,
+              operation.insertOne.document
+            );
+            if (!valid) fn.error(error, 400);
+            operation.insertOne.document = {
+              ...operation.insertOne.document,
+              ...(output || {}),
+              //createdAt: new Date(),
+            };
+
+            operation.insertOne.document = formatData(
+              operation.insertOne.document,
+              {
+                collection: collection,
+                tenant_id: this.#tenant_id,
+                action: "insertOne",
+              }
+            );
+          }
+        }
+
+        let result = await this.#tenant.database.db
+          ?.collection(collection)
+          .bulkWrite(operations, {
+            session: this.#session ? this.#session : undefined,
+          });
+        restActivity.save(this.#tenant, {
+          ip: sessionStorage()?.get()?._v?.ip,
+          state: sessionStorage()?.get()?.state,
+          uuid: sessionStorage()?.get()?.uuid,
+          operation: {
+            uuid: sessionStorage()?.get()?.uuid!,
+            type: "bulkWrite",
+            target: collection,
+            transaction: this.#session ? true : false,
+            internal: sessionStorage()?.get() ? false : true,
+            auth: sessionStorage()?.get()?._v?.isAuth ?? false,
+            role: sessionStorage()?.get()?.role!,
+            user: sessionStorage()?.get()?.state?.user,
+            state: sessionStorage()?.get()?.state,
+            ip: sessionStorage()?.get()?._v?.ip,
+            performedBy: {
+              user: sessionStorage()?.get()?.state?.user,
+              role: sessionStorage()?.get()?.role!,
+            },
+            payload: {
+              update: operations,
+            },
+          },
+        });
+
+        return resolve(toJson(result || {}));
+
+        // controle updateOne
+      } catch (err) {
+        return reject(err);
+      }
+    });
+  }
+
   async bulkUpdate(
     collection: string,
     updateOperations: bulkUpdateOperations
@@ -2132,6 +2315,9 @@ class useRest {
               );
               if (!valid) fn.error(error, 400);
             }
+            operationInstance.update.$currentDate = {
+              updatedAt: true,
+            };
           }
         }
 
@@ -2164,7 +2350,7 @@ class useRest {
             },
           },
         });
-        return resolve(result);
+        return resolve(toJson(result || {}));
       } catch (err) {
         return reject(err);
       }

package/driver/mongo/utils.ts

@@ -218,7 +218,7 @@ function toBson<T>(
 
     // updateOne
     if (options?.action == "updateOne") {
-      data.updateAt = new Date();
+      data.updatedAt = new Date();
     }
 
     // updateMany

package/package.json

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