Use action: instead of state: and update existing entities

Author: olivierkeke

enoceanmqtt/overlays/homeassistant/ha_communicator.py

@@ -400,13 +400,25 @@ def custom_merge(mapping_dict: Dict[int, Any], extra_mapping_dict: Dict[int, Any
             for type_, val_type in val_func.items():
                 if 'entities' in val_type:
                     for element in val_type['entities']:
-                        if 'state' not in element or element['state'] == 'present':
-                            element.pop('state', None)
-                            mapping_copy[rorg][func][type_]['entities'].append(element)
-                        elif element['state'] == 'absent':
+                        if 'action' in element and element['action'] == 'remove':
                             mapping_copy[rorg][func][type_]['entities'] = list(
                                 filter(
-                                    lambda entity: (entity['component'], entity['name']) != (element['component'], element['name']),
+                                    lambda entity: (entity['component'],
+                                                    entity['name']) != (element['component'],
+                                                                        element['name']),
                                     mapping_copy[rorg][func][type_]['entities'])
                             )
+                        if 'action' not in element or element['action'] == 'add':
+                            element.pop('action', None)
+                            try:
+                                identical_entity = next(entity
+                                                        for entity in mapping_copy[rorg][func][type_]['entities']
+                                                        if (entity['component'],
+                                                            entity['name']) == (element['component'],
+                                                                                element['name'])
+                                                        )
+                                identical_entity.update(element)
+                            except StopIteration:
+                                mapping_copy[rorg][func][type_]['entities'].append(element)
+
     return mapping_copy

tests/resources/extra_mapping.yaml

@@ -17,4 +17,4 @@
             device_class: outlet
         - component: "button"
           name: "query_status"
-          state: "absent"
+          action: "remove"

tests/test_mapping.py

@@ -40,7 +40,7 @@ def test_add_mapping_2(self):
         entity_to_add = {'component': "cover",
                          'name': "cover2",
                          'config': {},
-                         'state': 'present'}
+                         'action': 'add'}
         extra_mapping = {
             0xD2: {
                 0x05: {
@@ -60,13 +60,40 @@ def test_add_mapping_2(self):
         self.assertTrue(entity_to_add not in mapping[0xD2][0x05][0x00]['entities'])
         self.assertTrue('state' not in merged_mapping[0xD2][0x05][0x00]['entities'][-1])
 
+    def test_add_identical_mapping(self):
+        mapping_path = Path(__file__).parent.parent / 'enoceanmqtt' / 'overlays' / 'homeassistant' / 'mapping.yaml'
+        with open(mapping_path, 'r', encoding='utf-8') as mapping_file:
+            mapping = yaml.safe_load(mapping_file)
+        entity_to_add = {'component': "cover",
+                         'name': "cover",
+                         'added_key': 'added_value',
+                         'action': 'add'}
+        extra_mapping = {
+            0xD2: {
+                0x05: {
+                    0x00: {
+                        'entities':
+                            [
+                                entity_to_add,
+                            ]
+                    }
+                }
+            }
+        }
+        merged_mapping = custom_merge(mapping, extra_mapping)
+        print(mapping[0xD2][0x05][0x00]['entities'])
+        print(merged_mapping[0xD2][0x05][0x00]['entities'])
+        self.assertTrue((entity_to_add | mapping[0xD2][0x05][0x00]['entities'][0]) in merged_mapping[0xD2][0x05][0x00]['entities'])  # add assertion here
+        self.assertTrue(entity_to_add not in mapping[0xD2][0x05][0x00]['entities'])
+        self.assertTrue('action' not in merged_mapping[0xD2][0x05][0x00]['entities'][-1])
+
     def test_remove_mapping(self):
         mapping_path = Path(__file__).parent.parent / 'enoceanmqtt' / 'overlays' / 'homeassistant' / 'mapping.yaml'
         with open(mapping_path, 'r', encoding='utf-8') as mapping_file:
             mapping = yaml.safe_load(mapping_file)
         entity_to_remove = {'component': "cover",
                             'name': "cover",
-                            'state': 'absent'}
+                            'action': 'remove'}
         extra_mapping = {
             0xD2: {
                 0x05: {