Merge pull request #94 from itk-dev-rpa/hotfix/child_folder_not_found

Hotfix/child folder not found

Author: bakspace-itk

changelog.md

@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+
+- Child folders in Graph are now found, even with more than 10 child folders to go through.
+- Approving eflyt cases when the person is marked as "Afsluttet" now works.
+
 ## [2.8.1] - 2024-12-02
 
 ### Fixed

itk_dev_shared_components/eflyt/eflyt_case.py

@@ -171,7 +171,7 @@ def check_all_approved(browser: webdriver.Chrome) -> bool:
 
     for row in rows:
         row_status = row.find_element(By.XPATH, "td[6]").text
-        if row_status != "Godkendt":
+        if row_status not in ("Godkendt", "Afsluttet"):
             return False
     return True
 

itk_dev_shared_components/graph/mail.py

@@ -122,14 +122,33 @@ def get_folder_id_from_path(user: str, folder_path: str, graph_access: GraphAcce
     # Get child folders
     for child_folder in child_folders:
         endpoint = f"https://graph.microsoft.com/v1.0/users/{user}/mailFolders/{folder_id}/childFolders"
-        response = get_request(endpoint, graph_access).json()
-        folder_id = _find_folder(response, child_folder)
+        folder_id = recursive_find_folder(endpoint, graph_access, child_folder)
         if folder_id is None:
             raise ValueError(f"Child folder '{child_folder}' not found under '{main_folder}' for user '{user}'.")
 
     return folder_id
 
 
+def recursive_find_folder(endpoint: str, graph_access: GraphAccess, target_folder: str) -> str:
+    """Look for target folder at endpoint, recursively going through pagination if available and necessary.
+
+    Args:
+        endpoint: Graph endpoint to lookup folder.
+        graph_access: Access token for Graph API.
+        target_folder: ID of target folder.
+
+    Returns:
+        Return folder ID.
+    """
+    response = get_request(endpoint, graph_access).json()
+    folder_id = _find_folder(response, target_folder)
+
+    if folder_id is None and '@odata.nextLink' in response:
+        return recursive_find_folder(response['@odata.nextLink'], graph_access, target_folder)
+
+    return folder_id
+
+
 def list_email_attachments(email: Email, graph_access: GraphAccess) -> tuple[Attachment]:
     """List all attachments of the given email. This function only gets the id, name and size
     of the attachment. Use get_attachment_data to get the actual data of an attachment.

tests/test_graph/test_mail.py

@@ -26,6 +26,8 @@ def setUpClass(cls) -> None:
 
         # Define mail user and folders
         cls.user = os.environ['MAIL_USER']
+        cls.folder_prefix = os.environ['MAIL_FOLDER_PREFIX']
+        cls.folder_count = os.environ['MAIL_FOLDER_COUNT']
         cls.folder1 = os.environ['MAIL_FOLDER1']
         cls.folder2 = os.environ['MAIL_FOLDER2']
 
@@ -40,6 +42,10 @@ def test_correct_usage(self):
         self.assertEqual(len(emails), 1, "More than 1 email found in test folder!")
         email = emails[0]
 
+        # Check more than 10 folders
+        for i in range(int(self.folder_count)):
+            mail.get_emails_from_folder(self.user, f"{self.folder_prefix}{i}", self.graph_access)
+
         # Check email subject and body
         self.assertEqual(email.subject, "Test subject")
         self.assertTrue(email.get_text().startswith("Test text"))