Use a smaller key value

domainaware · Jan 10, 2025 · 7f8a2c0 · 7f8a2c0
1 parent e9c05dd
commit 7f8a2c0
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 12 deletions.
diff --git a/parsedmarc/__init__.py b/parsedmarc/__init__.py
@@ -1475,7 +1475,7 @@ def get_dmarc_reports_from_mbox(
                     report_id = parsed_email["report"]["report_metadata"]["report_id"]
                     report_key = f"{report_org}_{report_id}"
                     if report_key not in SEEN_AGGREGATE_REPORT_IDS:
-                        SEEN_AGGREGATE_REPORT_IDS[report_key] = report_key
+                        SEEN_AGGREGATE_REPORT_IDS[report_key] = True
                         aggregate_reports.append(parsed_email["report"])
                     else:
                         logger.debug(
@@ -1658,16 +1658,17 @@ def get_dmarc_reports_from_mailbox(
                 keep_alive=connection.keepalive,
             )
             if parsed_email["report_type"] == "aggregate":
-                if parsed_email["report_type"] == "aggregate":
-                    report_id = parsed_email["report"]["report_metadata"]["report_id"]
-                    if report_id not in SEEN_AGGREGATE_REPORT_IDS:
-                        SEEN_AGGREGATE_REPORT_IDS[report_id] = report_id
-                        aggregate_reports.append(parsed_email["report"])
-                    else:
-                        logger.debug(
-                            "Skipping duplicate aggregate report "
-                            f"with ID: {report_id}"
-                        )
+                report_org = parsed_email["report"]["report_metadata"]["org_name"]
+                report_id = parsed_email["report"]["report_metadata"]["report_id"]
+                report_key = f"{report_org}_{report_id}"
+                if report_key not in SEEN_AGGREGATE_REPORT_IDS:
+                    SEEN_AGGREGATE_REPORT_IDS[report_key] = True
+                    aggregate_reports.append(parsed_email["report"])
+                else:
+                    logger.debug(
+                        "Skipping duplicate aggregate report "
+                        f"with ID: {report_id}"
+                    )
                 aggregate_report_msg_uids.append(msg_uid)
             elif parsed_email["report_type"] == "forensic":
                 forensic_reports.append(parsed_email["report"])

diff --git a/parsedmarc/cli.py b/parsedmarc/cli.py
@@ -1423,7 +1423,7 @@ def process_reports(reports_):
                 report_id = result[0]["report"]["report_metadata"]["report_id"]
                 report_key = f"{report_org}_{report_id}"
                 if report_key not in SEEN_AGGREGATE_REPORT_IDS:
-                    SEEN_AGGREGATE_REPORT_IDS[report_key] = report_key
+                    SEEN_AGGREGATE_REPORT_IDS[report_key] = True
                     aggregate_reports.append(result[0]["report"])
                 else:
                     logger.debug(