Add two more folders that have appeared on test account

ecederstrand · May 13, 2024 · ae3bff0 · ae3bff0
1 parent be0cd9f
commit ae3bff0
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 13 deletions.
diff --git a/exchangelib/folders/__init__.py b/exchangelib/folders/__init__.py
@@ -21,6 +21,7 @@
     Birthdays,
     Calendar,
     CalendarLogging,
+    CalendarSearchCache,
     CommonViews,
     Companies,
     Conflicts,
@@ -68,6 +69,7 @@
     PdpProfileV2Secured,
     PeopleCentricConversationBuddies,
     PeopleConnect,
+    PersonMetadata,
     QedcDefaultRetention,
     QedcLongRetention,
     QedcMediumRetention,
@@ -134,6 +136,7 @@
     "Birthdays",
     "Calendar",
     "CalendarLogging",
+    "CalendarSearchCache",
     "CommonViews",
     "Companies",
     "Conflicts",
@@ -189,13 +192,14 @@
     "PdpProfileV2Secured",
     "PeopleCentricConversationBuddies",
     "PeopleConnect",
+    "PersonMetadata",
+    "PublicFoldersRoot",
     "QedcDefaultRetention",
-    "QedcMediumRetention",
     "QedcLongRetention",
+    "QedcMediumRetention",
     "QedcShortRetention",
     "QuarantinedEmail",
     "QuarantinedEmailDefaultCategory",
-    "PublicFoldersRoot",
     "QuickContacts",
     "RSSFeeds",
     "RecipientCache",
@@ -217,8 +221,8 @@
     "ServerFailures",
     "SharePointNotifications",
     "Sharing",
-    "Shortcuts",
     "ShortNotes",
+    "Shortcuts",
     "Signal",
     "SingleFolderQuerySet",
     "SkypeTeamsMessages",

diff --git a/exchangelib/folders/known_folders.py b/exchangelib/folders/known_folders.py
@@ -525,17 +525,7 @@ def is_deletable(self):
         return False
 
 
-class ExternalContacts(NonDeletableFolder):
-    DISTINGUISHED_FOLDER_ID = None
-    CONTAINER_CLASS = "IPF.Contact"
-    supported_item_models = (Contact, DistributionList)
-    LOCALIZED_NAMES = {
-        None: ("ExternalContacts",),
-    }
-
-
 class AllTodoTasks(NonDeletableFolder):
-    DISTINGUISHED_FOLDER_ID = None
     CONTAINER_CLASS = "IPF.Task"
     supported_item_models = (Task,)
     LOCALIZED_NAMES = {
@@ -557,6 +547,10 @@ class CalendarLogging(NonDeletableFolder):
     }
 
 
+class CalendarSearchCache(NonDeletableFolder):
+    CONTAINER_CLASS = "IPF.Appointment"
+
+
 class CommonViews(NonDeletableFolder):
     DEFAULT_ITEM_TRAVERSAL_DEPTH = ASSOCIATED
     LOCALIZED_NAMES = {
@@ -585,6 +579,14 @@ class ExchangeSyncData(NonDeletableFolder):
     pass
 
 
+class ExternalContacts(NonDeletableFolder):
+    CONTAINER_CLASS = "IPF.Contact"
+    supported_item_models = (Contact, DistributionList)
+    LOCALIZED_NAMES = {
+        None: ("ExternalContacts",),
+    }
+
+
 class Files(NonDeletableFolder):
     CONTAINER_CLASS = "IPF.Files"
     LOCALIZED_NAMES = {
@@ -650,6 +652,10 @@ class PassThroughSearchResults(NonDeletableFolder):
     }
 
 
+class PersonMetadata(NonDeletableFolder):
+    CONTAINER_CLASS = "IPF.Contact"
+
+
 class PdpProfileV2Secured(NonDeletableFolder):
     CONTAINER_CLASS = "IPF.StoreItem.PdpProfileSecured"
 
@@ -719,6 +725,7 @@ class WorkingSet(NonDeletableFolder):
     AllTodoTasks,
     Audits,
     CalendarLogging,
+    CalendarSearchCache,
     CommonViews,
     ConversationSettings,
     DefaultFoldersChangeHistory,
@@ -736,6 +743,7 @@ class WorkingSet(NonDeletableFolder):
     OrganizationalContacts,
     ParkedMessages,
     PassThroughSearchResults,
+    PersonMetadata,
     PdpProfileV2Secured,
     Reminders,
     RSSFeeds,

diff --git a/tests/test_folder.py b/tests/test_folder.py
@@ -32,6 +32,7 @@
     BaseFolder,
     Birthdays,
     Calendar,
+    CalendarSearchCache,
     CommonViews,
     Companies,
     Contacts,
@@ -69,6 +70,7 @@
     PassThroughSearchResults,
     PdpProfileV2Secured,
     PeopleCentricConversationBuddies,
+    PersonMetadata,
     PublicFoldersRoot,
     QuickContacts,
     RecipientCache,
@@ -593,6 +595,10 @@ def test_folder_grouping(self):
                     self.assertEqual(f.folder_class, "IPF.SkypeTeams.Message")
                 elif isinstance(f, SmsAndChatsSync):
                     self.assertEqual(f.folder_class, "IPF.SmsAndChatsSync")
+                elif isinstance(f, PersonMetadata):
+                    self.assertEqual(f.folder_class, "IPF.Contact")
+                elif isinstance(f, CalendarSearchCache):
+                    self.assertEqual(f.folder_class, "IPF.Appointment")
                 else:
                     self.assertIn(f.folder_class, (None, "IPF"), (f.name, f.__class__.__name__, f.folder_class))
                     self.assertIsInstance(f, Folder)