@dnax/core 0.69.15 → 0.69.17

package/driver/mongo/@types.ts

@@ -54,7 +54,7 @@ export type restEventType = [
 ];
 export type findOneParam = {
   $match: object;
-  $include?: Array<object>;
+  $include?: string[] | Lookup[];
   $matchInclude?: object;
 };
 

package/driver/mongo/rest.ts

@@ -81,6 +81,39 @@ const omitUpdate = [
   "$replaceWith",
 ];
 
+type activityInput = {
+  collection?: string;
+  operation: {
+    uuid: string;
+    type: string;
+    auth?: boolean;
+    state?: object;
+    role?: string | null | undefined;
+    transaction?: boolean;
+    internal?: boolean;
+    user?: object;
+    target?: string;
+    ip?: string;
+    timestamp?: Date;
+    performedBy?: {
+      user?: object;
+      role?: string;
+    };
+    payload?: {
+      update?: any;
+      data?: any;
+      input?: any;
+      filter?: any;
+      ids?: string[];
+      id?: string;
+      pipeline?: any;
+    };
+  };
+  state?: object;
+  ip?: string;
+  uuid?: string;
+};
+
 class useRest {
   #useHook: boolean;
   #c: Context | undefined;
@@ -93,26 +126,7 @@ class useRest {
    */
   db: Tenant["database"]["db"];
   activity: {
-    save: (activity: {
-      collection?: string;
-      data: {
-        update?: any;
-        data?: any;
-        input?: any;
-        filter?: any;
-        ids?: string[];
-        id?: string;
-      };
-      uuid?: string;
-      action: string;
-      ip?: string;
-      user?: object;
-      state?: object;
-      transaction?: boolean;
-      internal?: boolean;
-      auth?: boolean;
-      role?: string | null | undefined;
-    }) => Promise<any>;
+    save: (activity: activityInput) => Promise<any>;
     list: (
       collection: string,
       filter?: {
@@ -139,7 +153,7 @@ class useRest {
       client: this.#tenant.searchEngine?.meilisearch?.client!,
     };
     this.activity = {
-      save: async (activityInput) => {
+      save: async (activityInput: activityInput) => {
         return await restActivity.save(this.#tenant, activityInput);
       },
       list: async (
@@ -371,7 +385,7 @@ class useRest {
         if (options?.cleanDeep) {
           pipeline = cleanDeep(pipeline) as any;
         }
-        return await this.#tenant.database.db
+        return this.#tenant.database.db
           ?.collection(collection)
           .aggregate(toBson(pipeline), {
             allowDiskUse: true,
@@ -510,10 +524,34 @@ class useRest {
 
         // if action done
         restActivity.save(this.#tenant, {
-          collection: collection,
+          operation: {
+            uuid: sessionStorage()?.get()?.uuid,
+            type: "insertOne",
+            target: collection,
+            transaction: this.#session ? true : false,
+            ip: sessionStorage()?.get()?._v?.ip,
+            internal: sessionStorage()?.get() ? false : true,
+            auth: sessionStorage()?.get()?._v?.isAuth ?? false,
+            state: sessionStorage()?.get()?.state,
+            performedBy: {
+              user: sessionStorage()?.get()?.state?.user,
+              role: sessionStorage()?.get()?.role!,
+            },
+            payload: {
+              data: data,
+              _id: data?._id,
+            },
+          },
+          ip: sessionStorage()?.get()?._v?.ip,
+          state: sessionStorage()?.get()?.state,
+          uuid: sessionStorage()?.get()?.uuid,
+          /*  collection: collection,
           data: {
             data: data,
             _id: data?._id,
+            action: "insertOne",
+            collection: collection,
+            payload: data,
           },
           transaction: this.#session ? true : false,
           action: "insertOne",
@@ -523,8 +561,8 @@ class useRest {
           role: sessionStorage()?.get()?.role!,
           user: sessionStorage()?.get()?.state?.user,
           state: sessionStorage()?.get()?.state,
-          uuid: sessionStorage()?.get()?.uuid,
-        });
+          uuid: sessionStorage()?.get()?.uuid, */
+        } as activityInput);
         return resolve(toJson(data));
       } catch (err) {
         return reject(err);
@@ -653,7 +691,31 @@ class useRest {
 
         // if insertMany done
         restActivity.save(this.#tenant, {
-          collection: collection,
+          uuid: sessionStorage()?.get()?.uuid,
+          ip: sessionStorage()?.get()?._v?.ip,
+          state: sessionStorage()?.get()?.state,
+          operation: {
+            uuid: sessionStorage()?.get()?.uuid!,
+            type: "insertMany",
+            target: collection,
+            transaction: this.#session ? true : false,
+            internal: sessionStorage()?.get() ? false : true,
+            auth: sessionStorage()?.get()?._v?.isAuth ?? false,
+            state: sessionStorage()?.get()?.state,
+            role: sessionStorage()?.get()?.role!,
+            user: sessionStorage()?.get()?.state?.user,
+            ip: sessionStorage()?.get()?._v?.ip,
+            performedBy: {
+              user: sessionStorage()?.get()?.state?.user,
+              role: sessionStorage()?.get()?.role!,
+            },
+
+            payload: {
+              data: data,
+              _ids: data?.map((e) => e?._id),
+            },
+          },
+          /*  collection: collection,
           data: {
             data: toJson(data),
             _ids: data?.map((e) => e?._id),
@@ -666,7 +728,7 @@ class useRest {
           role: sessionStorage()?.get()?.role!,
           user: sessionStorage()?.get()?.state?.user,
           state: sessionStorage()?.get()?.state,
-          uuid: sessionStorage()?.get()?.uuid,
+          uuid: sessionStorage()?.get()?.uuid, */
         });
         return resolve(toJson(data));
       } catch (err) {
@@ -964,7 +1026,7 @@ class useRest {
         if (!col)
           return reject(new Error(`Collection ${collection} not found`));
 
-        await this.#tenant.database.db
+        return this.#tenant.database.db
           ?.collection(collection)
           .aggregate(formatData(buildPipeline(params, col)), {
             allowDiskUse: true,
@@ -1401,7 +1463,31 @@ class useRest {
         }
         // if updateOne done
         restActivity.save(this.#tenant, {
-          collection: collection,
+          operation: {
+            uuid: sessionStorage()?.get()?.uuid!,
+            type: "updateOne",
+            target: collection,
+            transaction: this.#session ? true : false,
+            internal: sessionStorage()?.get() ? false : true,
+            auth: sessionStorage()?.get()?._v?.isAuth ?? false,
+            role: sessionStorage()?.get()?.role!,
+            state: sessionStorage()?.get()?.state,
+            user: sessionStorage()?.get()?.state?.user,
+            ip: sessionStorage()?.get()?._v?.ip,
+            performedBy: {
+              user: sessionStorage()?.get()?.state?.user,
+              role: sessionStorage()?.get()?.role!,
+            },
+            payload: {
+              update: update,
+              _id: id,
+              _ids: [id],
+            },
+          },
+          state: sessionStorage()?.get()?.state,
+          uuid: sessionStorage()?.get()?.uuid,
+          ip: sessionStorage()?.get()?._v?.ip,
+          /* collection: collection,
           data: {
             update: update,
             _id: id,
@@ -1415,7 +1501,7 @@ class useRest {
           role: sessionStorage()?.get()?.role!,
           user: sessionStorage()?.get()?.state?.user,
           state: sessionStorage()?.get()?.state,
-          uuid: sessionStorage()?.get()?.uuid,
+          uuid: sessionStorage()?.get()?.uuid, */
         });
         return resolve(toJson(result?.doc || {}));
       } catch (err) {
@@ -1519,7 +1605,30 @@ class useRest {
         ``;
 
         restActivity.save(this.#tenant, {
-          collection: collection,
+          ip: sessionStorage()?.get()?._v?.ip,
+          state: sessionStorage()?.get()?.state,
+          uuid: sessionStorage()?.get()?.uuid,
+          operation: {
+            uuid: sessionStorage()?.get()?.uuid!,
+            type: "findAndUpdate",
+            target: collection,
+            transaction: this.#session ? true : false,
+            internal: sessionStorage()?.get() ? false : true,
+            auth: sessionStorage()?.get()?._v?.isAuth ?? false,
+            role: sessionStorage()?.get()?.role!,
+            state: sessionStorage()?.get()?.state,
+            user: sessionStorage()?.get()?.state?.user,
+            ip: sessionStorage()?.get()?._v?.ip,
+            performedBy: {
+              user: sessionStorage()?.get()?.state?.user,
+              role: sessionStorage()?.get()?.role!,
+            },
+            payload: {
+              update: update,
+              filter: filter,
+            },
+          },
+          /*    collection: collection,
           data: {
             update: update,
             filter: filter,
@@ -1532,7 +1641,7 @@ class useRest {
           role: sessionStorage()?.get()?.role!,
           user: sessionStorage()?.get()?.state?.user,
           state: sessionStorage()?.get()?.state,
-          uuid: sessionStorage()?.get()?.uuid,
+          uuid: sessionStorage()?.get()?.uuid, */
         });
 
         return resolve({
@@ -1638,7 +1747,30 @@ class useRest {
         }
         // if findOneAndUpdate
         restActivity.save(this.#tenant, {
-          collection: collection,
+          ip: sessionStorage()?.get()?._v?.ip,
+          state: sessionStorage()?.get()?.state,
+          uuid: sessionStorage()?.get()?.uuid,
+          operation: {
+            uuid: sessionStorage()?.get()?.uuid!,
+            type: "findOneAndUpdate",
+            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: update,
+              filter: filter,
+            },
+          },
+          /*  collection: collection,
           data: {
             update: update,
             filter: filter,
@@ -1651,7 +1783,7 @@ class useRest {
           role: sessionStorage()?.get()?.role!,
           user: sessionStorage()?.get()?.state?.user,
           state: sessionStorage()?.get()?.state,
-          uuid: sessionStorage()?.get()?.uuid,
+          uuid: sessionStorage()?.get()?.uuid, */
         });
         return resolve(toJson(result?.doc || {}));
       } catch (err) {
@@ -1842,7 +1974,30 @@ class useRest {
           }
           // if updateMany done
           restActivity.save(this.#tenant, {
-            collection: collection,
+            ip: sessionStorage()?.get()?._v?.ip,
+            state: sessionStorage()?.get()?.state,
+            uuid: sessionStorage()?.get()?.uuid,
+            operation: {
+              uuid: sessionStorage()?.get()?.uuid!,
+              type: "updateMany",
+              target: collection,
+              transaction: this.#session ? true : false,
+              internal: sessionStorage()?.get() ? false : true,
+              auth: sessionStorage()?.get()?._v?.isAuth ?? false,
+              state: sessionStorage()?.get()?.state,
+              role: sessionStorage()?.get()?.role!,
+              user: sessionStorage()?.get()?.state?.user,
+              ip: sessionStorage()?.get()?._v?.ip,
+              performedBy: {
+                user: sessionStorage()?.get()?.state?.user,
+                role: sessionStorage()?.get()?.role!,
+              },
+              payload: {
+                update: update,
+                _ids: ids,
+              },
+            },
+            /*  collection: collection,
             data: {
               update: update,
               _ids: ids,
@@ -1855,7 +2010,7 @@ class useRest {
             role: sessionStorage()?.get()?.role!,
             user: sessionStorage()?.get()?.state?.user,
             state: sessionStorage()?.get()?.state,
-            uuid: sessionStorage()?.get()?.uuid,
+            uuid: sessionStorage()?.get()?.uuid, */
           });
           return resolve(result.docs);
         } else {
@@ -1979,7 +2134,30 @@ class useRest {
 
         // if deleteOne done
         restActivity.save(this.#tenant, {
-          collection: collection,
+          ip: sessionStorage()?.get()?._v?.ip,
+          state: sessionStorage()?.get()?.state,
+          uuid: sessionStorage()?.get()?.uuid,
+          operation: {
+            uuid: sessionStorage()?.get()?.uuid!,
+            type: "deleteOne",
+            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,
+            ip: sessionStorage()?.get()?._v?.ip,
+            performedBy: {
+              user: sessionStorage()?.get()?.state?.user,
+              role: sessionStorage()?.get()?.role!,
+            },
+            payload: {
+              data: doc,
+              _id: id,
+              _ids: [id],
+            },
+          },
+          /*  collection: collection,
           data: {
             data: doc,
             _id: id,
@@ -1993,7 +2171,7 @@ class useRest {
           role: sessionStorage()?.get()?.role!,
           user: sessionStorage()?.get()?.state?.user,
           state: sessionStorage()?.get()?.state,
-          uuid: sessionStorage()?.get()?.uuid,
+          uuid: sessionStorage()?.get()?.uuid, */
         });
 
         return resolve(doc);
@@ -2117,7 +2295,29 @@ class useRest {
         }
         // if deleteMany done
         restActivity.save(this.#tenant, {
-          collection: collection,
+          ip: sessionStorage()?.get()?._v?.ip,
+          state: sessionStorage()?.get()?.state,
+          uuid: sessionStorage()?.get()?.uuid,
+          operation: {
+            uuid: sessionStorage()?.get()?.uuid!,
+            type: "deleteMany",
+            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,
+            ip: sessionStorage()?.get()?._v?.ip,
+            performedBy: {
+              user: sessionStorage()?.get()?.state?.user,
+              role: sessionStorage()?.get()?.role!,
+            },
+            payload: {
+              data: null,
+              _ids: ids,
+            },
+          },
+          /*  collection: collection,
           data: {
             data: null,
             _ids: ids,
@@ -2130,7 +2330,7 @@ class useRest {
           role: sessionStorage()?.get()?.role!,
           user: sessionStorage()?.get()?.state?.user,
           state: sessionStorage()?.get()?.state,
-          uuid: sessionStorage()?.get()?.uuid,
+          uuid: sessionStorage()?.get()?.uuid, */
         });
         return resolve(deletedIds);
       } catch (err) {
@@ -2149,7 +2349,29 @@ class useRest {
       try {
         let r = await this.#tenant.database.db?.collection(Collection).drop();
         restActivity.save(this.#tenant, {
-          collection: Collection,
+          ip: sessionStorage()?.get()?._v?.ip,
+          state: sessionStorage()?.get()?.state,
+          uuid: sessionStorage()?.get()?.uuid,
+          operation: {
+            uuid: sessionStorage()?.get()?.uuid!,
+            type: "dropCollection",
+            target: Collection,
+            transaction: this.#session ? true : false,
+            internal: sessionStorage()?.get() ? false : true,
+            auth: sessionStorage()?.get()?._v?.isAuth ?? false,
+            role: sessionStorage()?.get()?.role!,
+            state: sessionStorage()?.get()?.state,
+            user: sessionStorage()?.get()?.state?.user,
+            ip: sessionStorage()?.get()?._v?.ip,
+            performedBy: {
+              user: sessionStorage()?.get()?.state?.user,
+              role: sessionStorage()?.get()?.role!,
+            },
+            payload: {
+              data: null,
+            },
+          },
+          /* collection: Collection,
           data: {},
           action: "dropCollection",
           internal: sessionStorage()?.get() ? false : true,
@@ -2158,7 +2380,7 @@ class useRest {
           role: sessionStorage()?.get()?.role!,
           user: sessionStorage()?.get()?.state?.user,
           state: sessionStorage()?.get()?.state,
-          uuid: sessionStorage()?.get()?.uuid,
+          uuid: sessionStorage()?.get()?.uuid, */
         });
         return resolve(r);
       } catch (err) {
@@ -2246,27 +2468,21 @@ const restActivity = {
       $skip?: number;
     }
   ) => {},
-  save: async (
-    tenant: Tenant,
-    activity: {
-      collection?: string;
-      data: any;
-      uuid?: string | undefined | null;
-      action: string;
-      internal?: boolean;
-      ip?: string;
-      user?: object;
-      transaction?: boolean;
-      auth?: boolean;
-      state?: object;
-      role?: string;
-    }
-  ) => {
+  save: async (tenant: Tenant, activity: activityInput) => {
     return await tenant.database.db
       ?.collection("_activity_")
       .insertOne(
         toBson({
-          ip: activity?.ip,
+          ...activity,
+          createdAt: moment().format(),
+          updatedAt: moment().format(),
+          operation: {
+            ...activity.operation,
+            timestamp: moment().format(),
+          },
+          tenant: tenant.id,
+
+          /* ip: activity?.ip,
           tenant: tenant.id,
           data: activity?.data || {},
           action: activity.action,
@@ -2279,7 +2495,7 @@ const restActivity = {
           state: activity?.state,
           role: activity?.role,
           transaction: activity?.transaction ?? false,
-          uuid: activity?.uuid,
+          uuid: activity?.uuid, */
         })
       )
       .catch();

package/package.json

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