[connectors] fix(Zendesk) - fix the article garbage collection

connectors/src/connectors/zendesk/lib/sync_article.ts

@@ -25,27 +25,19 @@ const turndownService = new TurndownService();
  */
 export async function deleteArticle(
   connectorId: ModelId,
-  article: ZendeskFetchedArticle,
+  articleId: number,
   dataSourceConfig: DataSourceConfig,
   loggerArgs: Record<string, string | number | null>
 ): Promise<void> {
   logger.info(
-    {
-      ...loggerArgs,
-      connectorId,
-      articleId: article.id,
-      name: article.name,
-    },
+    { ...loggerArgs, connectorId, articleId },
     "[Zendesk] Deleting article."
   );
   await deleteFromDataSource(
     dataSourceConfig,
-    getArticleInternalId({ connectorId, articleId: article.id })
+    getArticleInternalId({ connectorId, articleId })
   );
-  await ZendeskArticleResource.deleteByArticleId({
-    connectorId,
-    articleId: article.id,
-  });
+  await ZendeskArticleResource.deleteByArticleId({ connectorId, articleId });
 }
 
 /**

connectors/src/connectors/zendesk/lib/zendesk_api.ts

@@ -177,6 +177,25 @@ async function fetchFromZendeskWithRetries({
   return response;
 }
 
+/**
+ * Fetches a single article from the Zendesk API.
+ */
+export async function fetchZendeskArticle({
+  brandSubdomain,
+  accessToken,
+  articleId,
+}: {
+  brandSubdomain: string;
+  accessToken: string;
+  articleId: number;
+}): Promise<ZendeskFetchedArticle | null> {
+  const response = await fetchFromZendeskWithRetries({
+    url: `https://${brandSubdomain}.zendesk.com/api/v2/help_center/articles/${articleId}`,
+    accessToken,
+  });
+  return response.article ?? null;
+}
+
 /**
  * Fetches a batch of categories from the Zendesk API.
  */

connectors/src/connectors/zendesk/temporal/gc_activities.ts

@@ -11,6 +11,7 @@ import { getZendeskSubdomainAndAccessToken } from "@connectors/connectors/zendes
 import {
   changeZendeskClientSubdomain,
   createZendeskClient,
+  fetchZendeskArticle,
 } from "@connectors/connectors/zendesk/lib/zendesk_api";
 import { ZENDESK_BATCH_SIZE } from "@connectors/connectors/zendesk/temporal/config";
 import { dataSourceConfigFromConnector } from "@connectors/lib/api/data_source_config";
@@ -150,10 +151,11 @@ export async function removeMissingArticleBatchActivity({
     dataSourceId: dataSourceConfig.dataSourceId,
   };
 
-  const zendeskApiClient = createZendeskClient(
-    await getZendeskSubdomainAndAccessToken(connector.connectionId)
+  const { subdomain, accessToken } = await getZendeskSubdomainAndAccessToken(
+    connector.connectionId
   );
-  await changeZendeskClientSubdomain(zendeskApiClient, {
+  const zendeskApiClient = createZendeskClient({ subdomain, accessToken });
+  const brandSubdomain = await changeZendeskClientSubdomain(zendeskApiClient, {
     connectorId,
     brandId,
   });
@@ -162,10 +164,18 @@ export async function removeMissingArticleBatchActivity({
   await concurrentExecutor(
     articleIds,
     async (articleId) => {
-      const article =
-        await zendeskApiClient.helpcenter.articles.show(articleId);
+      const article = await fetchZendeskArticle({
+        brandSubdomain,
+        articleId,
+        accessToken,
+      });
       if (!article) {
-        await deleteArticle(connectorId, article, dataSourceConfig, loggerArgs);
+        await deleteArticle(
+          connectorId,
+          articleId,
+          dataSourceConfig,
+          loggerArgs
+        );
       }
     },
     { concurrency: 10 }