From ad7780291ef140d5504be36bd4bf9685cafadf07 Mon Sep 17 00:00:00 2001
From: Erik Montnemery <erik@montnemery.com>
Date: Wed, 19 Feb 2025 22:40:03 +0100
Subject: [PATCH] Correct backup date when reading a backup created by
 supervisor (#138860)

---
 homeassistant/components/backup/util.py |  7 +++++--
 tests/components/backup/test_util.py    | 22 ++++++++++++++++++++++
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/homeassistant/components/backup/util.py b/homeassistant/components/backup/util.py
index 9d8f6e815dc..bd77880738e 100644
--- a/homeassistant/components/backup/util.py
+++ b/homeassistant/components/backup/util.py
@@ -104,12 +104,15 @@ def read_backup(backup_path: Path) -> AgentBackup:
                 bool, homeassistant.get("exclude_database", False)
             )
 
+        extra_metadata = cast(dict[str, bool | str], data.get("extra", {}))
+        date = extra_metadata.get("supervisor.backup_request_date", data["date"])
+
         return AgentBackup(
             addons=addons,
             backup_id=cast(str, data["slug"]),
             database_included=database_included,
-            date=cast(str, data["date"]),
-            extra_metadata=cast(dict[str, bool | str], data.get("extra", {})),
+            date=cast(str, date),
+            extra_metadata=extra_metadata,
             folders=folders,
             homeassistant_included=homeassistant_included,
             homeassistant_version=homeassistant_version,
diff --git a/tests/components/backup/test_util.py b/tests/components/backup/test_util.py
index 504e0d56d58..97e94eafb73 100644
--- a/tests/components/backup/test_util.py
+++ b/tests/components/backup/test_util.py
@@ -89,6 +89,28 @@ from tests.common import get_fixture_path
                 size=1234,
             ),
         ),
+        # Check the backup_request_date is used as date if present
+        (
+            b'{"compressed":true,"date":"2024-12-01T00:00:00.000000-00:00","homeassistant":'
+            b'{"exclude_database":true,"version":"2024.12.0.dev0"},"name":"test",'
+            b'"extra":{"supervisor.backup_request_date":"2025-12-01T00:00:00.000000-00:00"},'
+            b'"protected":true,"slug":"455645fe","type":"partial","version":2}',
+            AgentBackup(
+                addons=[],
+                backup_id="455645fe",
+                date="2025-12-01T00:00:00.000000-00:00",
+                database_included=False,
+                extra_metadata={
+                    "supervisor.backup_request_date": "2025-12-01T00:00:00.000000-00:00"
+                },
+                folders=[],
+                homeassistant_included=True,
+                homeassistant_version="2024.12.0.dev0",
+                name="test",
+                protected=True,
+                size=1234,
+            ),
+        ),
     ],
 )
 def test_read_backup(backup_json_content: bytes, expected_backup: AgentBackup) -> None: