Merge pull request #162 from mesnaround/update_sensor_state_query

Update sensor query in core.py

Author: robmarkcole

.gitignore

@@ -12,4 +12,5 @@ dist/*
 .idea/*
 
 venv*
+.venv*
 tests/test.db-*

detective/core.py

@@ -101,15 +101,17 @@ def fetch_all_sensor_data(self, limit=50000) -> pd.DataFrame:
         """
 
         query = """
-            SELECT states.state, states.last_updated_ts, states_meta.entity_id
-            FROM states
-            JOIN states_meta
-            ON states.metadata_id = states_meta.metadata_id
-            WHERE
-                states_meta.entity_id  LIKE '%sensor%'
-            AND
-                states.state NOT IN ('unknown', 'unavailable')
-            ORDER BY last_updated_ts DESC
+        SELECT states.state,
+            datetime(states.last_updated_ts, 'unixepoch', 'subsec') as last_updated_ts,
+            states_meta.entity_id,
+            state_attributes.shared_attrs
+        FROM states
+        JOIN states_meta ON states.metadata_id = states_meta.metadata_id
+        LEFT JOIN state_attributes ON states.attributes_id = state_attributes.attributes_id
+        WHERE states_meta.entity_id LIKE '%sensor%'
+        AND states.state NOT IN ('unknown',
+                                'unavailable')
+        ORDER BY last_updated_ts DESC
         """
 
         if limit is not None:

setup.py

@@ -18,7 +18,7 @@
 
 setup(
     name="HASS-data-detective",
-    version="3.0",
+    version="3.2",
     packages=find_packages(exclude=("tests",)),
     url="https://github.com/robmarkcole/HASS-data-detective",
     keywords=["home", "automation"],

tests/test_core.py

@@ -1,6 +1,7 @@
-from unittest.mock import patch
+from unittest.mock import patch, MagicMock
+import pandas as pd
 
-from detective.core import get_db_type, stripped_db_url
+from detective.core import get_db_type, stripped_db_url, HassDatabase
 
 
 def test_get_db_type():
@@ -26,3 +27,29 @@ def test_fetch_entities(mock_db):
         mock_db.fetch_entities()
 
     assert mock_db.entities == ["light.kitchen", "light.living_room", "switch.ac"]
+
+
+mock_data = pd.DataFrame({
+    "state": ["20.2", "50.1"],
+    "last_updated_ts": ["2025-10-01 12:00:00", "2025-10-01 12:05:00"],
+    "entity_id": ["sensor.temperature", "sensor.humidity"],
+    "shared_attrs": ["{}", "{}"]
+})
+
+@patch("sqlalchemy.create_engine")
+def test_fetch_all_sensor_data(mock_create_engine):
+    """Test that fetch_all_sensor_data returns a Pandas DataFrame."""
+    mock_con = MagicMock()
+    mock_engine = MagicMock()
+    mock_engine.connect.return_value = mock_con
+    mock_create_engine.return_value = mock_engine
+
+    # fetch_all_sensor_data uses read_sql_query under the hood
+    with patch("pandas.read_sql_query") as mock_read_sql:
+        mock_read_sql.return_value = mock_data
+
+        db = HassDatabase(url="sqlite:///tests/test.db", fetch_entities=False)
+        db.con = mock_con
+
+        result = db.fetch_all_sensor_data()
+        assert isinstance(result, pd.DataFrame)