Re-match profile to support Service Area

Signed-off-by: HunsupJung <hunsup.jung@samsung.com>

Author: HunsupJung

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

@@ -39,6 +39,7 @@ local RUN_MODE_SUPPORTED_MODES = "__run_mode_supported_modes"
 local CURRENT_RUN_MODE = "__current_run_mode"
 local CLEAN_MODE_SUPPORTED_MODES = "__clean_mode_supported_modes"
 local OPERATING_STATE_SUPPORTED_COMMANDS = "__operating_state_supported_commands"
+local SERVICE_AREA_PROFILED = "__SERVICE_AREA_PROFILED"
 
 local subscribed_attributes = {
   [capabilities.mode.ID] = {
@@ -76,12 +77,7 @@ local function component_to_endpoint(device, component_name)
   return find_default_endpoint(device, clusters.RvcOperationalState.ID)
 end
 
-local function device_init(driver, device)
-  device:subscribe()
-  device:set_component_to_endpoint_fn(component_to_endpoint)
-end
-
-local function do_configure(driver, device)
+local function match_profile(driver, device)
   local clean_mode_eps = device:get_endpoints(clusters.RvcCleanMode.ID) or {}
   local service_area_eps = embedded_cluster_utils.get_endpoints(device, clusters.ServiceArea.ID) or {}
 
@@ -95,6 +91,20 @@ local function do_configure(driver, device)
 
   device.log.info_with({hub_logs = true}, string.format("Updating device profile to %s.", profile_name))
   device:try_update_metadata({profile = profile_name})
+end
+
+local function device_init(driver, device)
+  device:subscribe()
+  device:set_component_to_endpoint_fn(component_to_endpoint)
+  if not device:get_field(SERVICE_AREA_PROFILED) and #device:get_endpoints(clusters.ServiceArea.ID) > 0 then
+    match_profile(driver, device)
+    device:set_field(SERVICE_AREA_PROFILED, true)
+  end
+end
+
+local function do_configure(driver, device)
+  match_profile(driver, device)
+  device:set_field(SERVICE_AREA_PROFILED, true)
   device:send(clusters.RvcOperationalState.attributes.AcceptedCommandList:read())
 end
 

drivers/SmartThings/matter-rvc/src/test/test_matter_rvc.lua

@@ -31,6 +31,7 @@ if version.api < 13 then
 end
 
 local APPLICATION_ENDPOINT = 10
+local SERVICE_AREA_PROFILED = "__SERVICE_AREA_PROFILED"
 
 local mock_device = test.mock_device.build_test_matter_device({
   profile = t_utils.get_profile_definition("rvc-clean-mode-service-area.yml"),
@@ -124,6 +125,7 @@ local CLEAN_MODES = {
 local CLEAN_MODE_LABELS = { CLEAN_MODES[1].label, CLEAN_MODES[2].label }
 
 local function supported_run_mode_init()
+  mock_device:set_field(SERVICE_AREA_PROFILED, true, { persist = true })
   test.socket.matter:__queue_receive({
     mock_device.id,
     clusters.RvcRunMode.attributes.SupportedModes:build_test_report_data(mock_device, APPLICATION_ENDPOINT,