From 754e1d6bc5b1b705f5c123143f508c9d00f9ab08 Mon Sep 17 00:00:00 2001
From: Nathan Thorpe <nathan@techstormpc.com>
Date: Wed, 6 Apr 2022 11:46:37 -0700
Subject: [PATCH] remove batch_size from fetch_messages method

---
 parsedmarc/__init__.py                | 4 ++--
 parsedmarc/mail/graph.py              | 2 +-
 parsedmarc/mail/imap.py               | 2 +-
 parsedmarc/mail/mailbox_connection.py | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/parsedmarc/__init__.py b/parsedmarc/__init__.py
index 5558346..e059798 100644
--- a/parsedmarc/__init__.py
+++ b/parsedmarc/__init__.py
@@ -1064,7 +1064,7 @@ def get_dmarc_reports_from_mailbox(connection: MailboxConnection,
         connection.create_folder(forensic_reports_folder)
         connection.create_folder(invalid_reports_folder)
 
-    messages = connection.fetch_messages(batch_size, reports_folder)
+    messages = connection.fetch_messages(reports_folder)
     total_messages = len(messages)
     logger.debug("Found {0} messages in {1}".format(len(messages),
                                                     reports_folder))
@@ -1170,7 +1170,7 @@ def get_dmarc_reports_from_mailbox(connection: MailboxConnection,
     results = OrderedDict([("aggregate_reports", aggregate_reports),
                            ("forensic_reports", forensic_reports)])
 
-    total_messages = len(connection.fetch_messages(batch_size, reports_folder))
+    total_messages = len(connection.fetch_messages(reports_folder))
 
     if not test and not batch_size and total_messages > 0:
         # Process emails that came in during the last run
diff --git a/parsedmarc/mail/graph.py b/parsedmarc/mail/graph.py
index ba12f25..f718856 100644
--- a/parsedmarc/mail/graph.py
+++ b/parsedmarc/mail/graph.py
@@ -50,7 +50,7 @@ class MSGraphConnection(MailboxConnection):
         else:
             logger.warning(f'Unknown response {resp.status_code} {resp.json()}')
 
-    def fetch_messages(self, batch_size: int, folder_name: str) -> List[str]:
+    def fetch_messages(self, folder_name: str) -> List[str]:
         """ Returns a list of message UIDs in the specified folder """
         folder_id = self._find_folder_id_from_folder_path(folder_name)
         result = self._client.get(f'/users/{self.mailbox_name}/mailFolders/{folder_id}/messages?$select=id')
diff --git a/parsedmarc/mail/imap.py b/parsedmarc/mail/imap.py
index 732cef3..3090b15 100644
--- a/parsedmarc/mail/imap.py
+++ b/parsedmarc/mail/imap.py
@@ -32,7 +32,7 @@ class IMAPConnection(MailboxConnection):
     def create_folder(self, folder_name: str):
         self._client.create_folder(folder_name)
 
-    def fetch_messages(self, batch_size, reports_folder: str):
+    def fetch_messages(self, reports_folder: str):
         self._client.select_folder(reports_folder)
         return self._client.search()
 
diff --git a/parsedmarc/mail/mailbox_connection.py b/parsedmarc/mail/mailbox_connection.py
index f5750f3..ecaa7f4 100644
--- a/parsedmarc/mail/mailbox_connection.py
+++ b/parsedmarc/mail/mailbox_connection.py
@@ -9,7 +9,7 @@ class MailboxConnection(ABC):
     def create_folder(self, folder_name: str):
         raise NotImplementedError
 
-    def fetch_messages(self, batch_size: int, reports_folder: str) -> List[str]:
+    def fetch_messages(self, reports_folder: str) -> List[str]:
         raise NotImplementedError
 
     def fetch_message(self, message_id) -> str: