@friggframework/core 2.0.0--canary.461.ec1ad4e.0 → 2.0.0--canary.461.7a66bdf.0

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

@@ -8,7 +8,9 @@ const { ModuleRepositoryInterface } = require('./module-repository-interface');
  * MongoDB-specific characteristics:
  * - Uses String IDs (ObjectId)
  * - No ID conversion needed (IDs are already strings)
- * - entity.__t (discriminator) → entity.subType
+ *
+ * Prisma Migration Notes:
+ * - Mongoose discriminator (__t) → moduleName field (module type: salesforce, hubspot, etc.)
  */
 class ModuleRepositoryMongo extends ModuleRepositoryInterface {
     constructor() {
@@ -100,7 +102,6 @@ class ModuleRepositoryMongo extends ModuleRepositoryInterface {
             userId: entity.userId,
             name: entity.name,
             externalId: entity.externalId,
-            type: entity.subType,
             moduleName: entity.moduleName,
         };
     }
@@ -127,7 +128,6 @@ class ModuleRepositoryMongo extends ModuleRepositoryInterface {
             userId: e.userId,
             name: e.name,
             externalId: e.externalId,
-            type: e.subType,
             moduleName: e.moduleName,
         }));
     }
@@ -154,7 +154,6 @@ class ModuleRepositoryMongo extends ModuleRepositoryInterface {
             userId: e.userId,
             name: e.name,
             externalId: e.externalId,
-            type: e.subType,
             moduleName: e.moduleName,
         }));
     }
@@ -185,7 +184,6 @@ class ModuleRepositoryMongo extends ModuleRepositoryInterface {
             userId: e.userId,
             name: e.name,
             externalId: e.externalId,
-            type: e.subType,
             moduleName: e.moduleName,
         }));
     }
@@ -232,7 +230,6 @@ class ModuleRepositoryMongo extends ModuleRepositoryInterface {
             userId: entity.userId,
             name: entity.name,
             externalId: entity.externalId,
-            type: entity.subType,
             moduleName: entity.moduleName,
         };
     }
@@ -248,7 +245,6 @@ class ModuleRepositoryMongo extends ModuleRepositoryInterface {
         const data = {
             userId: entityData.user || entityData.userId,
             credentialId: entityData.credential || entityData.credentialId,
-            subType: entityData.type || entityData.subType,
             name: entityData.name,
             moduleName: entityData.moduleName,
             externalId: entityData.externalId,
@@ -268,7 +264,6 @@ class ModuleRepositoryMongo extends ModuleRepositoryInterface {
             userId: entity.userId,
             name: entity.name,
             externalId: entity.externalId,
-            type: entity.subType,
             moduleName: entity.moduleName,
         };
     }
@@ -289,8 +284,6 @@ class ModuleRepositoryMongo extends ModuleRepositoryInterface {
             data.credentialId = updates.credential;
         if (updates.credentialId !== undefined)
             data.credentialId = updates.credentialId;
-        if (updates.type !== undefined) data.subType = updates.type;
-        if (updates.subType !== undefined) data.subType = updates.subType;
         if (updates.name !== undefined) data.name = updates.name;
         if (updates.moduleName !== undefined)
             data.moduleName = updates.moduleName;
@@ -313,7 +306,6 @@ class ModuleRepositoryMongo extends ModuleRepositoryInterface {
                 userId: entity.userId,
                 name: entity.name,
                 externalId: entity.externalId,
-                type: entity.subType,
                 moduleName: entity.moduleName,
             };
         } catch (error) {
@@ -377,7 +369,6 @@ class ModuleRepositoryMongo extends ModuleRepositoryInterface {
         if (filter.name) where.name = filter.name;
         if (filter.moduleName) where.moduleName = filter.moduleName;
         if (filter.externalId) where.externalId = this._toString(filter.externalId);
-        if (filter.subType) where.subType = filter.subType;
 
         return where;
     }

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

@@ -136,7 +136,6 @@ class ModuleRepositoryPostgres extends ModuleRepositoryInterface {
             userId: entity.userId?.toString(),
             name: entity.name,
             externalId: entity.externalId,
-            type: entity.subType,
             moduleName: entity.moduleName,
         };
     }
@@ -165,7 +164,6 @@ class ModuleRepositoryPostgres extends ModuleRepositoryInterface {
             userId: e.userId?.toString(),
             name: e.name,
             externalId: e.externalId,
-            type: e.subType,
             moduleName: e.moduleName,
         }));
     }
@@ -194,7 +192,6 @@ class ModuleRepositoryPostgres extends ModuleRepositoryInterface {
             userId: e.userId?.toString(),
             name: e.name,
             externalId: e.externalId,
-            type: e.subType,
             moduleName: e.moduleName,
         }));
     }
@@ -227,7 +224,6 @@ class ModuleRepositoryPostgres extends ModuleRepositoryInterface {
             userId: e.userId?.toString(),
             name: e.name,
             externalId: e.externalId,
-            type: e.subType,
             moduleName: e.moduleName,
         }));
     }
@@ -275,7 +271,6 @@ class ModuleRepositoryPostgres extends ModuleRepositoryInterface {
             userId: entity.userId?.toString(),
             name: entity.name,
             externalId: entity.externalId,
-            type: entity.subType,
             moduleName: entity.moduleName,
         };
     }
@@ -293,7 +288,6 @@ class ModuleRepositoryPostgres extends ModuleRepositoryInterface {
             credentialId: this._convertId(
                 entityData.credential || entityData.credentialId
             ),
-            subType: entityData.type || entityData.subType,
             name: entityData.name,
             moduleName: entityData.moduleName,
             externalId: entityData.externalId,
@@ -313,7 +307,6 @@ class ModuleRepositoryPostgres extends ModuleRepositoryInterface {
             userId: entity.userId?.toString(),
             name: entity.name,
             externalId: entity.externalId,
-            type: entity.subType,
             moduleName: entity.moduleName,
         };
     }
@@ -336,8 +329,6 @@ class ModuleRepositoryPostgres extends ModuleRepositoryInterface {
             data.credentialId = this._convertId(updates.credential);
         if (updates.credentialId !== undefined)
             data.credentialId = this._convertId(updates.credentialId);
-        if (updates.type !== undefined) data.subType = updates.type;
-        if (updates.subType !== undefined) data.subType = updates.subType;
         if (updates.name !== undefined) data.name = updates.name;
         if (updates.moduleName !== undefined)
             data.moduleName = updates.moduleName;
@@ -362,7 +353,6 @@ class ModuleRepositoryPostgres extends ModuleRepositoryInterface {
                 userId: entity.userId?.toString(),
                 name: entity.name,
                 externalId: entity.externalId,
-                type: entity.subType,
                 moduleName: entity.moduleName,
             };
         } catch (error) {
@@ -428,7 +418,6 @@ class ModuleRepositoryPostgres extends ModuleRepositoryInterface {
         if (filter.name) where.name = filter.name;
         if (filter.moduleName) where.moduleName = filter.moduleName;
         if (filter.externalId) where.externalId = this._toString(filter.externalId);
-        if (filter.subType) where.subType = filter.subType;
 
         return where;
     }

package/modules/repositories/module-repository.js

@@ -13,7 +13,7 @@ const { ModuleRepositoryInterface } = require('./module-repository-interface');
  * Migration from Mongoose:
  * - Constructor injection of Prisma client
  * - populate('credential') → include: { credential: true }
- * - entity.__t (discriminator) → entity.subType
+ * - Mongoose discriminator (__t) → moduleName field (module type: salesforce, hubspot, etc.)
  * - _id → id conversion automatic in Prisma
  */
 class ModuleRepository extends ModuleRepositoryInterface {
@@ -47,7 +47,6 @@ class ModuleRepository extends ModuleRepositoryInterface {
             userId: entity.userId,
             name: entity.name,
             externalId: entity.externalId,
-            type: entity.subType,
             moduleName: entity.moduleName,
         };
     }
@@ -72,7 +71,6 @@ class ModuleRepository extends ModuleRepositoryInterface {
             userId: e.userId,
             name: e.name,
             externalId: e.externalId,
-            type: e.subType,
             moduleName: e.moduleName,
         }));
     }
@@ -97,7 +95,6 @@ class ModuleRepository extends ModuleRepositoryInterface {
             userId: e.userId,
             name: e.name,
             externalId: e.externalId,
-            type: e.subType,
             moduleName: e.moduleName,
         }));
     }
@@ -126,7 +123,6 @@ class ModuleRepository extends ModuleRepositoryInterface {
             userId: e.userId,
             name: e.name,
             externalId: e.externalId,
-            type: e.subType,
             moduleName: e.moduleName,
         }));
     }
@@ -172,7 +168,6 @@ class ModuleRepository extends ModuleRepositoryInterface {
             userId: entity.userId,
             name: entity.name,
             externalId: entity.externalId,
-            type: entity.subType,
             moduleName: entity.moduleName,
         };
     }
@@ -189,7 +184,6 @@ class ModuleRepository extends ModuleRepositoryInterface {
         const data = {
             userId: entityData.user || entityData.userId,
             credentialId: entityData.credential || entityData.credentialId,
-            subType: entityData.type || entityData.subType,
             name: entityData.name,
             moduleName: entityData.moduleName,
             externalId: entityData.externalId,
@@ -208,7 +202,6 @@ class ModuleRepository extends ModuleRepositoryInterface {
             userId: entity.userId,
             name: entity.name,
             externalId: entity.externalId,
-            type: entity.subType,
             moduleName: entity.moduleName,
         };
     }
@@ -230,8 +223,6 @@ class ModuleRepository extends ModuleRepositoryInterface {
             data.credentialId = updates.credential;
         if (updates.credentialId !== undefined)
             data.credentialId = updates.credentialId;
-        if (updates.type !== undefined) data.subType = updates.type;
-        if (updates.subType !== undefined) data.subType = updates.subType;
         if (updates.name !== undefined) data.name = updates.name;
         if (updates.moduleName !== undefined)
             data.moduleName = updates.moduleName;
@@ -253,7 +244,6 @@ class ModuleRepository extends ModuleRepositoryInterface {
                 userId: entity.userId,
                 name: entity.name,
                 externalId: entity.externalId,
-                type: entity.subType,
                 moduleName: entity.moduleName,
             };
         } catch (error) {
@@ -318,7 +308,6 @@ class ModuleRepository extends ModuleRepositoryInterface {
         if (filter.name) where.name = filter.name;
         if (filter.moduleName) where.moduleName = filter.moduleName;
         if (filter.externalId) where.externalId = filter.externalId;
-        if (filter.subType) where.subType = filter.subType;
 
         return where;
     }

package/modules/use-cases/get-entity-options-by-id.js

@@ -32,7 +32,7 @@ class GetEntityOptionsById {
             );
         }
 
-        const entityType = entity.type;
+        const entityType = entity.moduleName;
         const moduleDefinition = this.moduleDefinitions.find((def) => {
             const modelName =
                 Module.getEntityModelFromDefinition(def).modelName;

package/modules/use-cases/get-module.js

@@ -22,7 +22,7 @@ class GetModule {
             );
         }
 
-        const entityType = entity.type;
+        const entityType = entity.moduleName;
         const moduleDefinition = this.moduleDefinitions.find((def) => {
             const modelName = Module.getEntityModelFromDefinition(def).modelName;
             return entityType === modelName;
@@ -44,7 +44,6 @@ class GetModule {
         return {
             id: module.entity.id,
             name: module.entity.name,
-            type: module.entity.moduleName,
             moduleName: module.entity.moduleName,
             credential: module.credential,
             externalId: module.entity.externalId,

package/modules/use-cases/refresh-entity-options.js

@@ -32,7 +32,7 @@ class RefreshEntityOptions {
             );
         }
 
-        const entityType = entity.type;
+        const entityType = entity.moduleName;
         const moduleDefinition = this.moduleDefinitions.find((def) => {
             const modelName =
                 Module.getEntityModelFromDefinition(def).modelName;

package/modules/use-cases/test-module-auth.js

@@ -27,7 +27,7 @@ class TestModuleAuth {
             );
         }
 
-        const entityType = entity.type;
+        const entityType = entity.moduleName;
         const moduleDefinition = this.moduleDefinitions.find((def) => {
             const modelName =
                 Module.getEntityModelFromDefinition(def).modelName;

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@friggframework/core",
     "prettier": "@friggframework/prettier-config",
-    "version": "2.0.0--canary.461.ec1ad4e.0",
+    "version": "2.0.0--canary.461.7a66bdf.0",
     "dependencies": {
         "@aws-sdk/client-apigatewaymanagementapi": "^3.588.0",
         "@aws-sdk/client-kms": "^3.588.0",
@@ -38,9 +38,9 @@
         }
     },
     "devDependencies": {
-        "@friggframework/eslint-config": "2.0.0--canary.461.ec1ad4e.0",
-        "@friggframework/prettier-config": "2.0.0--canary.461.ec1ad4e.0",
-        "@friggframework/test": "2.0.0--canary.461.ec1ad4e.0",
+        "@friggframework/eslint-config": "2.0.0--canary.461.7a66bdf.0",
+        "@friggframework/prettier-config": "2.0.0--canary.461.7a66bdf.0",
+        "@friggframework/test": "2.0.0--canary.461.7a66bdf.0",
         "@prisma/client": "^6.17.0",
         "@types/lodash": "4.17.15",
         "@typescript-eslint/eslint-plugin": "^8.0.0",
@@ -80,5 +80,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "ec1ad4ecc89d650ce9380aeed0a29831d8e2098b"
+    "gitHead": "7a66bdf03d77c34934096e197e731cda22940937"
 }

package/prisma-mongodb/schema.prisma

@@ -92,7 +92,6 @@ model Credential {
   id          String   @id @default(auto()) @map("_id") @db.ObjectId
   userId      String?  @db.ObjectId
   user        User?    @relation(fields: [userId], references: [id], onDelete: Cascade)
-  subType     String?
   authIsValid Boolean?
   externalId  String?
 
@@ -116,7 +115,6 @@ model Entity {
   id           String      @id @default(auto()) @map("_id") @db.ObjectId
   credentialId String?     @db.ObjectId
   credential   Credential? @relation(fields: [credentialId], references: [id], onDelete: SetNull)
-  subType      String?
   userId       String?     @db.ObjectId
   user         User?       @relation(fields: [userId], references: [id], onDelete: Cascade)
   name         String?

package/prisma-postgresql/schema.prisma

@@ -90,7 +90,6 @@ model Credential {
   id          Int      @id @default(autoincrement())
   userId      Int?
   user        User?    @relation(fields: [userId], references: [id], onDelete: Cascade)
-  subType     String?
   authIsValid Boolean?
   externalId  String?
 
@@ -113,7 +112,6 @@ model Entity {
   id           Int         @id @default(autoincrement())
   credentialId Int?
   credential   Credential? @relation(fields: [credentialId], references: [id], onDelete: SetNull)
-  subType      String?
   userId       Int?
   user         User?       @relation(fields: [userId], references: [id], onDelete: Cascade)
   name         String?

package/types/module-plugin/index.d.ts

@@ -5,7 +5,6 @@ declare module "@friggframework/module-plugin" {
   export class Credential extends Model {
     userId: string;
     authIsValid: boolean;
-    subType: string;
     externalId: string;
   }
 
@@ -13,7 +12,6 @@ declare module "@friggframework/module-plugin" {
 
   export class Entity extends Model {
     credentialId: string;
-    subType: string;
     userId: string;
     name: string;
     externalId: string;