Clean up info changed handling

Author: ctowns

drivers/SmartThings/matter-thermostat/src/init.lua

@@ -501,24 +501,14 @@ local function device_init(driver, device)
 end
 
 local function info_changed(driver, device, event, args)
-  -- Note this is needed because device:subscribe() does not recalculate
-  -- the subscribed attributes each time it is run, that only happens at init.
-  -- This will change in the 0.48.x release of the lua libs.
-  for cap_id, attributes in pairs(subscribed_attributes) do
-    if device:supports_capability_by_id(cap_id) then
-      for _, attr in ipairs(attributes) do
-        device:add_subscribed_attribute(attr)
-      end
-    end
+  if device:get_field(SUPPORTED_COMPONENT_CAPABILITIES) then
+    --re-up subscription with new capabilities using the modular supports_capability override
+      device:extend_device("supports_capability_by_id", supports_capability_by_id_modular)
   end
 
   if device.profile.id ~= args.old_st_store.profile.id then
-    if device:get_field(SUPPORTED_COMPONENT_CAPABILITIES) then
-      --re-up subscription with new capabilities using the modular supports_capability override
-       device:extend_device("supports_capability_by_id", supports_capability_by_id_modular)
-    end
+    device:subscribe()
   end
-  device:subscribe()
   schedule_polls_for_cumulative_energy_imported(device)
 end
 

drivers/SmartThings/matter-thermostat/src/test/test_matter_thermo_featuremap.lua

@@ -253,7 +253,12 @@ test.register_coroutine_test(
     end
     test.socket.matter:__expect_send({mock_device.id, subscribe_request})
 
-    test.socket.device_lifecycle:__queue_receive(mock_device:generate_info_changed({}))
+    local updates = {
+      profile = {
+        id = "new-profile"
+      }
+    }
+    test.socket.device_lifecycle:__queue_receive(mock_device:generate_info_changed(updates))
 end
 )