Merge pull request #830 from elie222/fix/folder-exists-outlook

Author: elie222

apps/web/utils/outlook/errors.ts

@@ -0,0 +1,15 @@
+// Helper functions for checking Outlook API errors
+
+/**
+ * Check if an error indicates that a resource already exists
+ * (e.g., folder, filter, category, etc.)
+ */
+export function isAlreadyExistsError(error: unknown): boolean {
+ // biome-ignore lint/suspicious/noExplicitAny: simplest
+ const errorMessage = (error as any)?.message || "";
+ return (
+ errorMessage.includes("already exists") ||
+ errorMessage.includes("duplicate") ||
+ errorMessage.includes("conflict")
+ );
+}

apps/web/utils/outlook/filter.ts

@@ -4,6 +4,7 @@ import type {
  OutlookCategory,
 } from "@microsoft/microsoft-graph-types";
 import { createScopedLogger } from "@/utils/logger";
+import { isAlreadyExistsError } from "./errors";
 
 const logger = createScopedLogger("outlook/filter");
 
@@ -42,7 +43,7 @@ export async function createFilter(options: {
 
  return { status: 201, data: response };
  } catch (error) {
- if (isFilterExistsError(error)) {
+ if (isAlreadyExistsError(error)) {
  logger.warn("Filter already exists", { from });
  return { status: 200 };
  }
@@ -82,7 +83,7 @@ export async function createAutoArchiveFilter({
 
  return { status: 201, data: response };
  } catch (error) {
- if (isFilterExistsError(error)) {
+ if (isAlreadyExistsError(error)) {
  logger.warn("Auto-archive filter already exists", { from });
  return { status: 200 };
  }
@@ -127,17 +128,6 @@ export async function getFiltersList(options: { client: OutlookClient }) {
  }
 }
 
-// Helper function to check if a filter already exists
-function isFilterExistsError(error: unknown) {
- // biome-ignore lint/suspicious/noExplicitAny: simplest
- const errorMessage = (error as any)?.message || "";
- return (
- errorMessage.includes("already exists") ||
- errorMessage.includes("duplicate") ||
- errorMessage.includes("conflict")
- );
-}
-
 // Additional helper functions for Outlook-specific operations
 
 export async function createCategoryFilter({
@@ -188,7 +178,7 @@ export async function createCategoryFilter({
  "Category created. Note: Categories must be applied to individual messages.",
  };
  } catch (error) {
- if (isFilterExistsError(error)) {
+ if (isAlreadyExistsError(error)) {
  logger.warn("Category filter already exists", { from, categoryName });
  return { status: 200 };
  }

apps/web/utils/outlook/folders.ts

@@ -1,6 +1,7 @@
 import type { MailFolder } from "@microsoft/microsoft-graph-types";
 import type { OutlookClient } from "./client";
 import { createScopedLogger } from "@/utils/logger";
+import { isAlreadyExistsError } from "./errors";
 
 const logger = createScopedLogger("outlook/folders");
 
@@ -56,6 +57,14 @@ export async function getOutlookChildFolders(
  return response.value.map(convertMailFolderToOutlookFolder);
 }
 
+async function findOutlookFolderByName(
+ client: OutlookClient,
+ folderName: string,
+): Promise<OutlookFolder | undefined> {
+ const folders = await getOutlookRootFolders(client);
+ return folders.find((folder) => folder.displayName === folderName);
+}
+
 export async function getOutlookFolderTree(
  client: OutlookClient,
  expandLevels = 6,
@@ -97,18 +106,30 @@ export async function getOrCreateOutlookFolderIdByName(
  client: OutlookClient,
  folderName: string,
 ): Promise<string> {
- const folders = await getOutlookRootFolders(client);
- const existingFolder = folders.find(
- (folder) => folder.displayName === folderName,
- );
+ const existingFolder = await findOutlookFolderByName(client, folderName);
 
  if (existingFolder) {
  return existingFolder.id;
  }
 
- const response = await client.getClient().api("/me/mailFolders").post({
- displayName: folderName,
- });
-
- return response.id;
+ try {
+ const response = await client.getClient().api("/me/mailFolders").post({
+ displayName: folderName,
+ });
+
+ return response.id;
+ } catch (error) {
+ // If folder already exists (race condition or created between check and create),
+ // fetch folders again and return the existing folder ID
+ if (isAlreadyExistsError(error)) {
+ logger.info("Folder already exists, fetching existing folder", {
+ folderName,
+ });
+ const folder = await findOutlookFolderByName(client, folderName);
+ if (folder) {
+ return folder.id;
+ }
+ }
+ throw error;
+ }
 }

version.txt

@@ -1 +1 @@
-v2.13.6
+v2.13.7