Merge pull request #2249 from SmartThingsCommunity/bugfix/BUG2-4791

zigbee-contact: Remove incorrect device events from init handler

Author: NoahCornell

drivers/SmartThings/zigbee-contact/src/aqara/init.lua

@@ -55,11 +55,6 @@ local function device_init(driver, device)
     device:add_configured_attribute(attribute)
     device:add_monitored_attribute(attribute)
   end
-
-  device:emit_event(capabilities.batteryLevel.type("CR1632"))
-  device:emit_event(capabilities.batteryLevel.quantity(1))
-  device:emit_event(capabilities.batteryLevel.battery("normal"))
-  device:emit_event(capabilities.contactSensor.contact.open())
 end
 
 local function do_configure(self, device)
@@ -68,6 +63,13 @@ local function do_configure(self, device)
     PRIVATE_CLUSTER_ID, PRIVATE_ATTRIBUTE_ID, MFG_CODE, data_types.Uint8, 0x01))
 end
 
+local function added_handler(driver, device)
+  device:emit_event(capabilities.batteryLevel.type("CR1632"))
+  device:emit_event(capabilities.batteryLevel.quantity(1))
+  device:emit_event(capabilities.batteryLevel.battery("normal"))
+  device:emit_event(capabilities.contactSensor.contact.open())
+end
+
 local function contact_status_handler(self, device, value, zb_rx)
   if value.value == 1 or value.value == true then
     device:emit_event(capabilities.contactSensor.contact.open())
@@ -126,7 +128,8 @@ local aqara_contact_handler = {
   },
   lifecycle_handlers = {
     init = device_init,
-    doConfigure = do_configure
+    doConfigure = do_configure,
+    added = added_handler,
   },
   can_handle = is_aqara_products
 }

drivers/SmartThings/zigbee-contact/src/test/test_aqara_contact_sensor.lua

@@ -47,12 +47,6 @@ zigbee_test_utils.prepare_zigbee_env_info()
 
 local function test_init()
   test.mock_device.add_test_device(mock_device)
-  test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.batteryLevel.type("CR1632")))
-  test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.batteryLevel.quantity(1)))
-  test.socket.capability:__expect_send(mock_device:generate_test_message("main",
-    capabilities.batteryLevel.battery("normal")))
-  test.socket.capability:__expect_send(mock_device:generate_test_message("main",
-    capabilities.contactSensor.contact.open()))
 end
 
 test.set_test_init_function(test_init)
@@ -84,6 +78,19 @@ test.register_coroutine_test(
   end
 )
 
+test.register_coroutine_test(
+  "added lifecycle handler",
+  function()
+    test.socket.device_lifecycle:__queue_receive({ mock_device.id, "added" })
+    test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.batteryLevel.type("CR1632")))
+    test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.batteryLevel.quantity(1)))
+    test.socket.capability:__expect_send(mock_device:generate_test_message("main",
+      capabilities.batteryLevel.battery("normal")))
+    test.socket.capability:__expect_send(mock_device:generate_test_message("main",
+      capabilities.contactSensor.contact.open()))
+  end
+)
+
 test.register_coroutine_test(
   "heartbeat battery events - normal status",
   function()