Apply feedback

Author: PopDaph

connectors/src/admin/db.ts

@@ -25,7 +25,6 @@ import {
 import {
   IntercomArticle,
   IntercomCollection,
-  IntercomConnectorState,
 } from "@connectors/lib/models/intercom";
 import logger from "@connectors/logger/logger";
 
@@ -49,7 +48,6 @@ async function main(): Promise<void> {
   await NotionConnectorPageCacheEntry.sync({ alter: true });
   await NotionConnectorResourcesToCheckCacheEntry.sync({ alter: true });
   await GoogleDriveConfig.sync({ alter: true });
-  await IntercomConnectorState.sync({ alter: true });
   await IntercomCollection.sync({ alter: true });
   await IntercomArticle.sync({ alter: true });
 

connectors/src/connectors/intercom/index.ts

@@ -1,7 +1,6 @@
 import { validateAccessToken } from "@connectors/connectors/intercom/lib/intercom_api";
 import { ConnectorPermissionRetriever } from "@connectors/connectors/interface";
-import { Connector, ModelId, sequelize_conn } from "@connectors/lib/models";
-import { IntercomConnectorState } from "@connectors/lib/models/intercom";
+import { Connector, ModelId } from "@connectors/lib/models";
 import { getAccessTokenFromNango } from "@connectors/lib/nango_helpers";
 import { Err, Ok, Result } from "@connectors/lib/result";
 import logger from "@connectors/logger/logger";
@@ -36,26 +35,13 @@ export async function createIntercomConnector(
   }
 
   try {
-    const connector = await sequelize_conn.transaction(async (t) => {
-      const connector = await Connector.create(
-        {
-          type: "intercom",
-          connectionId: nangoConnectionId,
-          workspaceAPIKey: dataSourceConfig.workspaceAPIKey,
-          workspaceId: dataSourceConfig.workspaceId,
-          dataSourceName: dataSourceConfig.dataSourceName,
-          defaultNewResourcePermission: "read_write",
-        },
-        { transaction: t }
-      );
-      await IntercomConnectorState.create(
-        {
-          connectorId: connector.id,
-        },
-        { transaction: t }
-      );
-
-      return connector;
+    const connector = await Connector.create({
+      type: "intercom",
+      connectionId: nangoConnectionId,
+      workspaceAPIKey: dataSourceConfig.workspaceAPIKey,
+      workspaceId: dataSourceConfig.workspaceId,
+      dataSourceName: dataSourceConfig.dataSourceName,
+      defaultNewResourcePermission: "read_write",
     });
     // @todo Daph lauch workflow await launchIntercomSyncWorkflow(connector.id);
     return new Ok(connector.id.toString());

connectors/src/connectors/intercom/lib/intercom_api.ts

@@ -1,8 +1,8 @@
 import { Client } from "intercom-client";
 
-export async function validateAccessToken(notionAccessToken: string) {
+export async function validateAccessToken(intercomAccessToken: string) {
   const intercomClient = new Client({
-    tokenAuth: { token: notionAccessToken },
+    tokenAuth: { token: intercomAccessToken },
   });
   try {
     await intercomClient.admins.list(); // trying a simple request

connectors/src/lib/models/intercom.ts

@@ -9,50 +9,6 @@ import {
 
 import { Connector, sequelize_conn } from "@connectors/lib/models";
 
-export class IntercomConnectorState extends Model<
-  InferAttributes<IntercomConnectorState>,
-  InferCreationAttributes<IntercomConnectorState>
-> {
-  declare id: CreationOptional<number>;
-  declare createdAt: CreationOptional<Date>;
-  declare updatedAt: CreationOptional<Date>;
-
-  declare lastGarbageCollectionFinishTime?: Date;
-
-  declare connectorId: ForeignKey<Connector["id"]>;
-}
-
-IntercomConnectorState.init(
-  {
-    id: {
-      type: DataTypes.INTEGER,
-      autoIncrement: true,
-      primaryKey: true,
-    },
-    createdAt: {
-      type: DataTypes.DATE,
-      allowNull: false,
-      defaultValue: DataTypes.NOW,
-    },
-    updatedAt: {
-      type: DataTypes.DATE,
-      allowNull: false,
-      defaultValue: DataTypes.NOW,
-    },
-    lastGarbageCollectionFinishTime: {
-      type: DataTypes.DATE,
-      allowNull: true,
-    },
-  },
-  {
-    sequelize: sequelize_conn,
-    modelName: "intercom_connector_states",
-    indexes: [{ fields: ["connectorId"], unique: true }],
-  }
-);
-
-Connector.hasOne(IntercomConnectorState);
-
 export class IntercomCollection extends Model<
   InferAttributes<IntercomCollection>,
   InferCreationAttributes<IntercomCollection>
@@ -61,7 +17,7 @@ export class IntercomCollection extends Model<
   declare createdAt: CreationOptional<Date>;
   declare updatedAt: CreationOptional<Date>;
 
-  declare workspaceId: string;
+  declare intercomWorkspaceId: string;
   declare collectionId: string;
 
   declare helpCenterId: string | null;
@@ -90,7 +46,7 @@ IntercomCollection.init(
       allowNull: false,
       defaultValue: DataTypes.NOW,
     },
-    workspaceId: {
+    intercomWorkspaceId: {
       type: DataTypes.STRING,
       allowNull: false,
     },
@@ -118,7 +74,10 @@ IntercomCollection.init(
   {
     sequelize: sequelize_conn,
     indexes: [
-      { fields: ["workspaceId", "collectionId", "connectorId"], unique: true },
+      {
+        fields: ["intercomWorkspaceId", "collectionId", "connectorId"],
+        unique: true,
+      },
       { fields: ["connectorId"] },
       { fields: ["collectionId"] },
     ],
@@ -135,7 +94,7 @@ export class IntercomArticle extends Model<
   declare createdAt: CreationOptional<Date>;
   declare updatedAt: CreationOptional<Date>;
 
-  declare workspaceId: string;
+  declare intercomWorkspaceId: string;
   declare articleId: string;
   declare authorId: string;
 
@@ -164,7 +123,7 @@ IntercomArticle.init(
       allowNull: false,
       defaultValue: DataTypes.NOW,
     },
-    workspaceId: {
+    intercomWorkspaceId: {
       type: DataTypes.STRING,
       allowNull: false,
     },
@@ -192,7 +151,10 @@ IntercomArticle.init(
   {
     sequelize: sequelize_conn,
     indexes: [
-      { fields: ["workspaceId", "articleId", "connectorId"], unique: true },
+      {
+        fields: ["intercomWorkspaceId", "articleId", "connectorId"],
+        unique: true,
+      },
       { fields: ["connectorId"] },
       { fields: ["articleId"] },
     ],