From c451518959027cfb16e70a5ebb000ac8136af269 Mon Sep 17 00:00:00 2001
From: Allen Porter <allen@thebends.org>
Date: Sun, 23 Mar 2025 09:07:42 -0700
Subject: [PATCH] Fix google calendar working location event filtering
 (#141222)

---
 homeassistant/components/google/calendar.py |  6 +++---
 tests/components/google/test_calendar.py    | 13 +++++++++++--
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/homeassistant/components/google/calendar.py b/homeassistant/components/google/calendar.py
index 4f8ffba1d19..4ae8c8cce03 100644
--- a/homeassistant/components/google/calendar.py
+++ b/homeassistant/components/google/calendar.py
@@ -383,9 +383,9 @@ class GoogleCalendarEntity(
             for attendee in event.attendees
         ):
             return False
-
-        if event.event_type == EventTypeEnum.WORKING_LOCATION:
-            return self.entity_description.working_location
+        is_working_location_event = event.event_type == EventTypeEnum.WORKING_LOCATION
+        if self.entity_description.working_location != is_working_location_event:
+            return False
         if self._ignore_availability:
             return True
         return event.transparency == OPAQUE
diff --git a/tests/components/google/test_calendar.py b/tests/components/google/test_calendar.py
index 3d10e753714..274e310fbce 100644
--- a/tests/components/google/test_calendar.py
+++ b/tests/components/google/test_calendar.py
@@ -1451,6 +1451,13 @@ async def test_working_location_ignored(
     assert state.attributes.get("message") == expected_event_message
 
 
+@pytest.mark.parametrize(
+    ("event_type", "expected_event_message"),
+    [
+        ("workingLocation", "Test All Day Event"),
+        ("default", None),
+    ],
+)
 @pytest.mark.parametrize("calendar_is_primary", [True])
 async def test_working_location_entity(
     hass: HomeAssistant,
@@ -1458,12 +1465,14 @@ async def test_working_location_entity(
     entity_registry: er.EntityRegistry,
     mock_events_list_items: Callable[[list[dict[str, Any]]], None],
     component_setup: ComponentSetup,
+    event_type: str,
+    expected_event_message: str | None,
 ) -> None:
     """Test that working location events are registered under a disabled by default entity."""
     event = {
         **TEST_EVENT,
         **upcoming(),
-        "eventType": "workingLocation",
+        "eventType": event_type,
     }
     mock_events_list_items([event])
     assert await component_setup()
@@ -1484,7 +1493,7 @@ async def test_working_location_entity(
     state = hass.states.get("calendar.working_location")
     assert state
     assert state.name == "Working location"
-    assert state.attributes.get("message") == "Test All Day Event"
+    assert state.attributes.get("message") == expected_event_message
 
 
 @pytest.mark.parametrize("calendar_is_primary", [False])