From c9e7c76ee55c628e59c659bd331ab6bf0352bed6 Mon Sep 17 00:00:00 2001
From: "Mr. Bubbles" <manni@zapto.de>
Date: Sun, 25 Aug 2024 15:15:47 +0200
Subject: [PATCH] Fix missing id in Habitica completed todos API response
 (#124565)

* Fix missing id in completed todos API response

* Copy id only if none

* Update homeassistant/components/habitica/coordinator.py

Co-authored-by: Paulus Schoutsen <paulus@home-assistant.io>

---------

Co-authored-by: Paulus Schoutsen <paulus@home-assistant.io>
---
 .../components/habitica/coordinator.py        |  9 +++++-
 tests/components/habitica/test_init.py        | 28 +++++++++----------
 2 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/homeassistant/components/habitica/coordinator.py b/homeassistant/components/habitica/coordinator.py
index 4e949b703fb..357643593e4 100644
--- a/homeassistant/components/habitica/coordinator.py
+++ b/homeassistant/components/habitica/coordinator.py
@@ -56,7 +56,14 @@ class HabiticaDataUpdateCoordinator(DataUpdateCoordinator[HabiticaData]):
         try:
             user_response = await self.api.user.get()
             tasks_response = await self.api.tasks.user.get()
-            tasks_response.extend(await self.api.tasks.user.get(type="completedTodos"))
+            tasks_response.extend(
+                [
+                    {"id": task["_id"], **task}
+                    for task in await self.api.tasks.user.get(type="completedTodos")
+                    if task.get("_id")
+                ]
+            )
+
         except ClientResponseError as error:
             if error.status == HTTPStatus.TOO_MANY_REQUESTS:
                 _LOGGER.debug("Currently rate limited, skipping update")
diff --git a/tests/components/habitica/test_init.py b/tests/components/habitica/test_init.py
index 31c3a1fae39..4c2b1e2aae6 100644
--- a/tests/components/habitica/test_init.py
+++ b/tests/components/habitica/test_init.py
@@ -73,7 +73,20 @@ def common_requests(aioclient_mock: AiohttpClientMocker) -> AiohttpClientMocker:
             }
         },
     )
-
+    aioclient_mock.get(
+        "https://habitica.com/api/v3/tasks/user?type=completedTodos",
+        json={
+            "data": [
+                {
+                    "text": "this is a mock todo #5",
+                    "id": 5,
+                    "_id": 5,
+                    "type": "todo",
+                    "completed": True,
+                }
+            ]
+        },
+    )
     aioclient_mock.get(
         "https://habitica.com/api/v3/tasks/user",
         json={
@@ -88,19 +101,6 @@ def common_requests(aioclient_mock: AiohttpClientMocker) -> AiohttpClientMocker:
             ]
         },
     )
-    aioclient_mock.get(
-        "https://habitica.com/api/v3/tasks/user?type=completedTodos",
-        json={
-            "data": [
-                {
-                    "text": "this is a mock todo #5",
-                    "id": 5,
-                    "type": "todo",
-                    "completed": True,
-                }
-            ]
-        },
-    )
 
     aioclient_mock.post(
         "https://habitica.com/api/v3/tasks/user",