From 49ed804043df350a6d85c19ee3377b71ecc8e920 Mon Sep 17 00:00:00 2001
From: Tim <117555636+4homeassistant@users.noreply.github.com>
Date: Sun, 28 Dec 2025 00:10:21 +0100
Subject: [PATCH] Fix: Retrieve topic_prefix from config_entry for
 set_config_key service

Fixes #159

The set_config_key service was using the hardcoded DEFAULT_TOPIC_PREFIX instead of reading the actual topic_prefix from the config entry. This caused the service to fail when the user's configured topic_prefix differed from the default value.

Changes:
- Store config entries in hass.data for service access
- Retrieve topic_prefix from config_entry instead of using hardcoded default
- Add debug logging to show the actual topic being published to
- Add cleanup of stored config entries on unload

Tested with my own topic_prefix configurations:
- With leading slash: /go-eCharger
---
 custom_components/goecharger_mqtt/__init__.py | 50 +++++++++++++++----
 1 file changed, 41 insertions(+), 9 deletions(-)

diff --git a/custom_components/goecharger_mqtt/__init__.py b/custom_components/goecharger_mqtt/__init__.py
index 7f50002..f8852f1 100644
--- a/custom_components/goecharger_mqtt/__init__.py
+++ b/custom_components/goecharger_mqtt/__init__.py
@@ -14,6 +14,8 @@
     ATTR_KEY,
     ATTR_SERIAL_NUMBER,
     ATTR_VALUE,
+    CONF_SERIAL_NUMBER,
+    CONF_TOPIC_PREFIX,
     DEFAULT_TOPIC_PREFIX,
     DOMAIN,
 )
@@ -41,15 +43,24 @@
 async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up go-eCharger (MQTT) from a config entry."""
     hass.data.setdefault(DOMAIN, {})
+    
+    # Store config entries for service access
+    if DOMAIN not in hass.data:
+        hass.data[DOMAIN] = {}
+    hass.data[DOMAIN][entry.data[CONF_SERIAL_NUMBER]] = entry
+    
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
-
     return True
 
 
 async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Unload a config entry."""
     unload_ok = await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
-
+    
+    # Remove config entry from storage
+    if unload_ok:
+        hass.data[DOMAIN].pop(entry.data[CONF_SERIAL_NUMBER], None)
+    
     return unload_ok
 
 
@@ -58,12 +69,25 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
 
     @callback
     async def set_config_key_service(call: ServiceCall) -> None:
-        serial_number = call.data.get("serial_number")
-        key = call.data.get("key")
-        # @FIXME: Retrieve the topic_prefix from config_entry
-        topic = f"{DEFAULT_TOPIC_PREFIX}/{serial_number}/{key}/set"
-        value = call.data.get("value")
-
+        serial_number = call.data.get(ATTR_SERIAL_NUMBER)
+        key = call.data.get(ATTR_KEY)
+        value = call.data.get(ATTR_VALUE)
+        
+        # Retrieve the topic_prefix from config_entry
+        topic_prefix = DEFAULT_TOPIC_PREFIX
+        if DOMAIN in hass.data and serial_number in hass.data[DOMAIN]:
+            entry = hass.data[DOMAIN][serial_number]
+            topic_prefix = entry.data.get(CONF_TOPIC_PREFIX, DEFAULT_TOPIC_PREFIX)
+        else:
+            _LOGGER.warning(
+                "No config entry found for serial number %s, using default topic prefix %s",
+                serial_number,
+                DEFAULT_TOPIC_PREFIX,
+            )
+        
+        topic = f"{topic_prefix}/{serial_number}/{key}/set"
+        
+        # Handle value formatting
         if not value.isnumeric():
             if value in ["true", "True"]:
                 value = "true"
@@ -71,7 +95,15 @@ async def set_config_key_service(call: ServiceCall) -> None:
                 value = "false"
             else:
                 value = f'"{value}"'
-
+        
+        _LOGGER.debug(
+            "Publishing to topic %s with value %s (serial: %s, key: %s)",
+            topic,
+            value,
+            serial_number,
+            key,
+        )
+        
         await mqtt.async_publish(hass, topic, value)
 
     hass.services.async_register(