@friggframework/core 2.0.0-next.66 → 2.0.0-next.68

package/modules/repositories/module-repository-documentdb.js

@@ -101,47 +101,74 @@ class ModuleRepositoryDocumentDB extends ModuleRepositoryInterface {
     }
 
     async createEntity(entityData) {
+        const {
+            user,
+            userId,
+            credential,
+            credentialId,
+            name,
+            moduleName,
+            externalId,
+            ...dynamicData
+        } = entityData;
+
         const document = {
-            userId: toObjectId(entityData.user || entityData.userId),
-            credentialId: toObjectId(entityData.credential || entityData.credentialId) || null,
-            name: entityData.name ?? null,
-            moduleName: entityData.moduleName ?? null,
-            externalId: entityData.externalId ?? null,
-            accountId: entityData.accountId ?? null,
+            userId: toObjectId(userId || user),
+            credentialId: toObjectId(credentialId || credential) || null,
+            name: name ?? null,
+            moduleName: moduleName ?? null,
+            externalId: externalId ?? null,
+            data: dynamicData,
         };
         const insertedId = await insertOne(this.prisma, 'Entity', document);
         const created = await findOne(this.prisma, 'Entity', { _id: insertedId });
-        const credential = await this._fetchCredential(created?.credentialId);
-        return this._mapEntity(created, credential);
+        const credentialObj = await this._fetchCredential(created?.credentialId);
+        return this._mapEntity(created, credentialObj);
     }
 
     async updateEntity(entityId, updates) {
         const objectId = toObjectId(entityId);
         if (!objectId) return null;
+
+        const existing = await findOne(this.prisma, 'Entity', { _id: objectId });
+        if (!existing) return null;
+
+        const {
+            user,
+            userId,
+            credential,
+            credentialId,
+            name,
+            moduleName,
+            externalId,
+            ...dynamicData
+        } = updates;
+
         const updatePayload = {};
-        if (updates.user !== undefined || updates.userId !== undefined) {
-            const userVal = updates.user !== undefined ? updates.user : updates.userId;
-            updatePayload.userId = toObjectId(userVal) || null;
+        if (user !== undefined || userId !== undefined) {
+            updatePayload.userId = toObjectId(userId || user) || null;
+        }
+        if (credential !== undefined || credentialId !== undefined) {
+            updatePayload.credentialId = toObjectId(credentialId || credential) || null;
         }
-        if (updates.credential !== undefined || updates.credentialId !== undefined) {
-            const credVal = updates.credential !== undefined ? updates.credential : updates.credentialId;
-            updatePayload.credentialId = toObjectId(credVal) || null;
+        if (name !== undefined) updatePayload.name = name;
+        if (moduleName !== undefined) updatePayload.moduleName = moduleName;
+        if (externalId !== undefined) updatePayload.externalId = externalId;
+
+        if (Object.keys(dynamicData).length > 0) {
+            updatePayload.data = { ...(existing.data || {}), ...dynamicData };
         }
-        if (updates.name !== undefined) updatePayload.name = updates.name;
-        if (updates.moduleName !== undefined) updatePayload.moduleName = updates.moduleName;
-        if (updates.externalId !== undefined) updatePayload.externalId = updates.externalId;
-        if (updates.accountId !== undefined) updatePayload.accountId = updates.accountId;
-        const result = await updateOne(
+
+        await updateOne(
             this.prisma,
             'Entity',
             { _id: objectId },
             { $set: updatePayload }
         );
-        const modified = result?.nModified ?? result?.n ?? 0;
-        if (modified === 0) return null;
         const updated = await findOne(this.prisma, 'Entity', { _id: objectId });
-        const credential = await this._fetchCredential(updated?.credentialId);
-        return this._mapEntity(updated, credential);
+        if (!updated) return null;
+        const credentialObj = await this._fetchCredential(updated?.credentialId);
+        return this._mapEntity(updated, credentialObj);
     }
 
     async deleteEntity(entityId) {
@@ -291,14 +318,15 @@ class ModuleRepositoryDocumentDB extends ModuleRepositoryInterface {
     }
 
     _mapEntity(doc, credential) {
+        const dynamicData = doc?.data || {};
         return {
             id: fromObjectId(doc?._id),
-            accountId: doc?.accountId ?? null,
             credential,
             userId: fromObjectId(doc?.userId),
             name: doc?.name ?? null,
             externalId: doc?.externalId ?? null,
             moduleName: doc?.moduleName ?? null,
+            ...dynamicData,
         };
     }
 }

package/modules/repositories/module-repository-mongo.js

@@ -97,12 +97,12 @@ class ModuleRepositoryMongo extends ModuleRepositoryInterface {
 
         return {
             id: entity.id,
-            accountId: entity.accountId,
             credential,
             userId: entity.userId,
             name: entity.name,
             externalId: entity.externalId,
             moduleName: entity.moduleName,
+            ...(entity.data || {}),
         };
     }
 
@@ -123,12 +123,12 @@ class ModuleRepositoryMongo extends ModuleRepositoryInterface {
 
         return entities.map((e) => ({
             id: e.id,
-            accountId: e.accountId,
             credential: credentialMap.get(e.credentialId) || null,
             userId: e.userId,
             name: e.name,
             externalId: e.externalId,
             moduleName: e.moduleName,
+            ...(e.data || {}),
         }));
     }
 
@@ -149,12 +149,12 @@ class ModuleRepositoryMongo extends ModuleRepositoryInterface {
 
         return entities.map((e) => ({
             id: e.id,
-            accountId: e.accountId,
             credential: credentialMap.get(e.credentialId) || null,
             userId: e.userId,
             name: e.name,
             externalId: e.externalId,
             moduleName: e.moduleName,
+            ...(e.data || {}),
         }));
     }
 
@@ -179,12 +179,12 @@ class ModuleRepositoryMongo extends ModuleRepositoryInterface {
 
         return entities.map((e) => ({
             id: e.id,
-            accountId: e.accountId,
             credential: credentialMap.get(e.credentialId) || null,
             userId: e.userId,
             name: e.name,
             externalId: e.externalId,
             moduleName: e.moduleName,
+            ...(e.data || {}),
         }));
     }
 
@@ -225,12 +225,12 @@ class ModuleRepositoryMongo extends ModuleRepositoryInterface {
 
         return {
             id: entity.id,
-            accountId: entity.accountId,
             credential,
             userId: entity.userId,
             name: entity.name,
             externalId: entity.externalId,
             moduleName: entity.moduleName,
+            ...(entity.data || {}),
         };
     }
 
@@ -242,29 +242,40 @@ class ModuleRepositoryMongo extends ModuleRepositoryInterface {
      * @returns {Promise<Object>} Created entity object with string IDs
      */
     async createEntity(entityData) {
+        const {
+            user,
+            userId,
+            credential,
+            credentialId,
+            name,
+            moduleName,
+            externalId,
+            ...dynamicData
+        } = entityData;
+
         const data = {
-            userId: entityData.user || entityData.userId,
-            credentialId: entityData.credential || entityData.credentialId,
-            name: entityData.name,
-            moduleName: entityData.moduleName,
-            externalId: entityData.externalId,
-            accountId: entityData.accountId,
+            userId: userId || user,
+            credentialId: credentialId || credential,
+            name,
+            moduleName,
+            externalId,
+            data: dynamicData,
         };
 
         const entity = await this.prisma.entity.create({
             data,
         });
 
-        const credential = await this._fetchCredential(entity.credentialId);
+        const credentialObj = await this._fetchCredential(entity.credentialId);
 
         return {
             id: entity.id,
-            accountId: entity.accountId,
-            credential,
+            credential: credentialObj,
             userId: entity.userId,
             name: entity.name,
             externalId: entity.externalId,
             moduleName: entity.moduleName,
+            ...(entity.data || {}),
         };
     }
 
@@ -277,36 +288,56 @@ class ModuleRepositoryMongo extends ModuleRepositoryInterface {
      * @returns {Promise<Object|null>} Updated entity object with string IDs or null if not found
      */
     async updateEntity(entityId, updates) {
-        const data = {};
-        if (updates.user !== undefined) data.userId = updates.user;
-        if (updates.userId !== undefined) data.userId = updates.userId;
-        if (updates.credential !== undefined)
-            data.credentialId = updates.credential;
-        if (updates.credentialId !== undefined)
-            data.credentialId = updates.credentialId;
-        if (updates.name !== undefined) data.name = updates.name;
-        if (updates.moduleName !== undefined)
-            data.moduleName = updates.moduleName;
-        if (updates.externalId !== undefined)
-            data.externalId = updates.externalId;
-        if (updates.accountId !== undefined) data.accountId = updates.accountId;
+        const existing = await this.prisma.entity.findUnique({
+            where: { id: entityId },
+        });
+
+        if (!existing) {
+            return null;
+        }
+
+        const {
+            user,
+            userId,
+            credential,
+            credentialId,
+            name,
+            moduleName,
+            externalId,
+            ...dynamicData
+        } = updates;
+
+        const schemaUpdates = {};
+        if (user !== undefined || userId !== undefined) {
+            schemaUpdates.userId = userId || user;
+        }
+        if (credential !== undefined || credentialId !== undefined) {
+            schemaUpdates.credentialId = credentialId || credential;
+        }
+        if (name !== undefined) schemaUpdates.name = name;
+        if (moduleName !== undefined) schemaUpdates.moduleName = moduleName;
+        if (externalId !== undefined) schemaUpdates.externalId = externalId;
+
+        if (Object.keys(dynamicData).length > 0) {
+            schemaUpdates.data = { ...(existing.data || {}), ...dynamicData };
+        }
 
         try {
             const entity = await this.prisma.entity.update({
                 where: { id: entityId },
-                data,
+                data: schemaUpdates,
             });
 
-            const credential = await this._fetchCredential(entity.credentialId);
+            const credentialObj = await this._fetchCredential(entity.credentialId);
 
             return {
                 id: entity.id,
-                accountId: entity.accountId,
-                credential,
+                credential: credentialObj,
                 userId: entity.userId,
                 name: entity.name,
                 externalId: entity.externalId,
                 moduleName: entity.moduleName,
+                ...(entity.data || {}),
             };
         } catch (error) {
             if (error.code === 'P2025') {

package/modules/repositories/module-repository-postgres.js

@@ -131,12 +131,12 @@ class ModuleRepositoryPostgres extends ModuleRepositoryInterface {
 
         return {
             id: entity.id.toString(),
-            accountId: entity.accountId,
             credential,
             userId: entity.userId?.toString(),
             name: entity.name,
             externalId: entity.externalId,
             moduleName: entity.moduleName,
+            ...(entity.data || {}),
         };
     }
 
@@ -159,12 +159,12 @@ class ModuleRepositoryPostgres extends ModuleRepositoryInterface {
 
         return entities.map((e) => ({
             id: e.id.toString(),
-            accountId: e.accountId,
             credential: credentialMap.get(e.credentialId) || null,
             userId: e.userId?.toString(),
             name: e.name,
             externalId: e.externalId,
             moduleName: e.moduleName,
+            ...(e.data || {}),
         }));
     }
 
@@ -187,12 +187,12 @@ class ModuleRepositoryPostgres extends ModuleRepositoryInterface {
 
         return entities.map((e) => ({
             id: e.id.toString(),
-            accountId: e.accountId,
             credential: credentialMap.get(e.credentialId) || null,
             userId: e.userId?.toString(),
             name: e.name,
             externalId: e.externalId,
             moduleName: e.moduleName,
+            ...(e.data || {}),
         }));
     }
 
@@ -219,12 +219,12 @@ class ModuleRepositoryPostgres extends ModuleRepositoryInterface {
 
         return entities.map((e) => ({
             id: e.id.toString(),
-            accountId: e.accountId,
             credential: credentialMap.get(e.credentialId) || null,
             userId: e.userId?.toString(),
             name: e.name,
             externalId: e.externalId,
             moduleName: e.moduleName,
+            ...(e.data || {}),
         }));
     }
 
@@ -266,12 +266,12 @@ class ModuleRepositoryPostgres extends ModuleRepositoryInterface {
 
         return {
             id: entity.id.toString(),
-            accountId: entity.accountId,
             credential,
             userId: entity.userId?.toString(),
             name: entity.name,
             externalId: entity.externalId,
             moduleName: entity.moduleName,
+            ...(entity.data || {}),
         };
     }
 
@@ -283,31 +283,40 @@ class ModuleRepositoryPostgres extends ModuleRepositoryInterface {
      * @returns {Promise<Object>} Created entity object with string IDs
      */
     async createEntity(entityData) {
+        const {
+            user,
+            userId,
+            credential,
+            credentialId,
+            name,
+            moduleName,
+            externalId,
+            ...dynamicData
+        } = entityData;
+
         const data = {
-            userId: this._convertId(entityData.user || entityData.userId),
-            credentialId: this._convertId(
-                entityData.credential || entityData.credentialId
-            ),
-            name: entityData.name,
-            moduleName: entityData.moduleName,
-            externalId: entityData.externalId,
-            accountId: entityData.accountId,
+            userId: this._convertId(userId || user),
+            credentialId: this._convertId(credentialId || credential),
+            name,
+            moduleName,
+            externalId,
+            data: dynamicData,
         };
 
         const entity = await this.prisma.entity.create({
             data,
         });
 
-        const credential = await this._fetchCredential(entity.credentialId);
+        const credentialObj = await this._fetchCredential(entity.credentialId);
 
         return {
             id: entity.id.toString(),
-            accountId: entity.accountId,
-            credential,
+            credential: credentialObj,
             userId: entity.userId?.toString(),
             name: entity.name,
             externalId: entity.externalId,
             moduleName: entity.moduleName,
+            ...(entity.data || {}),
         };
     }
 
@@ -320,40 +329,58 @@ class ModuleRepositoryPostgres extends ModuleRepositoryInterface {
      * @returns {Promise<Object|null>} Updated entity object with string IDs or null if not found
      */
     async updateEntity(entityId, updates) {
-        const data = {};
-        if (updates.user !== undefined)
-            data.userId = this._convertId(updates.user);
-        if (updates.userId !== undefined)
-            data.userId = this._convertId(updates.userId);
-        if (updates.credential !== undefined)
-            data.credentialId = this._convertId(updates.credential);
-        if (updates.credentialId !== undefined)
-            data.credentialId = this._convertId(updates.credentialId);
-        if (updates.name !== undefined) data.name = updates.name;
-        if (updates.moduleName !== undefined)
-            data.moduleName = updates.moduleName;
-        if (updates.externalId !== undefined)
-            data.externalId = updates.externalId;
-        if (updates.accountId !== undefined) data.accountId = updates.accountId;
+        const intId = this._convertId(entityId);
 
-        try {
-            const intId = this._convertId(entityId);
+        const existing = await this.prisma.entity.findUnique({
+            where: { id: intId },
+        });
 
+        if (!existing) {
+            return null;
+        }
+
+        const {
+            user,
+            userId,
+            credential,
+            credentialId,
+            name,
+            moduleName,
+            externalId,
+            ...dynamicData
+        } = updates;
+
+        const schemaUpdates = {};
+        if (user !== undefined || userId !== undefined) {
+            schemaUpdates.userId = this._convertId(userId || user);
+        }
+        if (credential !== undefined || credentialId !== undefined) {
+            schemaUpdates.credentialId = this._convertId(credentialId || credential);
+        }
+        if (name !== undefined) schemaUpdates.name = name;
+        if (moduleName !== undefined) schemaUpdates.moduleName = moduleName;
+        if (externalId !== undefined) schemaUpdates.externalId = externalId;
+
+        if (Object.keys(dynamicData).length > 0) {
+            schemaUpdates.data = { ...(existing.data || {}), ...dynamicData };
+        }
+
+        try {
             const entity = await this.prisma.entity.update({
                 where: { id: intId },
-                data,
+                data: schemaUpdates,
             });
 
-            const credential = await this._fetchCredential(entity.credentialId);
+            const credentialObj = await this._fetchCredential(entity.credentialId);
 
             return {
                 id: entity.id.toString(),
-                accountId: entity.accountId,
-                credential,
+                credential: credentialObj,
                 userId: entity.userId?.toString(),
                 name: entity.name,
                 externalId: entity.externalId,
                 moduleName: entity.moduleName,
+                ...(entity.data || {}),
             };
         } catch (error) {
             if (error.code === 'P2025') {