Repository fixes

devices_module/__init__.py

@@ -16,4 +16,4 @@
 Devices module
 """
 
-__version__ = "0.2.17"
+__version__ = "0.2.18"

devices_module/models.py

@@ -878,8 +878,8 @@ def get_property_by_id(self, property_id: uuid.UUID) -> DevicePropertyItem or Ch
             if self._items is None:
                 self.initialize()
 
-            if property_id in self._items:
-                return self._items[property_id]
+            if property_id.__str__() in self._items:
+                return self._items[property_id.__str__()]
 
             return None
 
@@ -1007,7 +1007,7 @@ class ConnectorsRepository(ABC):
 
         @author         Adam Kadlec <adam.kadlec@fastybird.com>
         """
-        __items: List[ConnectorItem] or None = None
+        __items: Dict[str, ConnectorItem] or None = None
 
         __iterator_index = 0
 
@@ -1018,9 +1018,8 @@ def get_connector_by_id(self, connector_id: uuid.UUID) -> ConnectorItem or None:
             if self.__items is None:
                 self.initialize()
 
-            for record in self.__items:
-                if record.connector_id == connector_id:
-                    return record
+            if connector_id.__str__() in self.__items:
+                return self.__items[connector_id.__str__()]
 
             return None
 
@@ -1031,7 +1030,7 @@ def get_connector_by_key(self, connector_key: str) -> ConnectorItem or None:
             if self.__items is None:
                 self.initialize()
 
-            for record in self.__items:
+            for record in self.__items.values():
                 if record.key == connector_key:
                     return record
 
@@ -1048,18 +1047,16 @@ def clear(self) -> None:
         @orm.db_session
         def initialize(self) -> None:
             """Initialize repository by fetching entities from database"""
-            self.__items = []
+            self.__items = dict()
 
             for entity in ConnectorEntity.select():
-                self.__items.append(
-                    ConnectorItem(
-                        connector_id=entity.connector_id,
-                        connector_name=entity.name,
-                        connector_key=entity.key,
-                        connector_enabled=entity.enabled,
-                        connector_type=entity.type,
-                        connector_params=entity.params,
-                    )
+                self.__items[entity.connector_id.__str__()] = ConnectorItem(
+                    connector_id=entity.connector_id,
+                    connector_name=entity.name,
+                    connector_key=entity.key,
+                    connector_enabled=entity.enabled,
+                    connector_type=entity.type,
+                    connector_params=entity.params,
                 )
 
         # -----------------------------------------------------------------------------
@@ -1076,16 +1073,16 @@ def __len__(self):
             if self.__items is None:
                 self.initialize()
 
-            return len(self.__items)
+            return len(self.__items.values())
 
         # -----------------------------------------------------------------------------
 
         def __next__(self) -> ConnectorItem:
             if self.__items is None:
                 self.initialize()
 
-            if self.__iterator_index < len(self.__items):
-                result: ConnectorItem = self.__items[self.__iterator_index]
+            if self.__iterator_index < len(self.__items.values()):
+                result: ConnectorItem = self.__items.values()[self.__iterator_index]
 
                 self.__iterator_index += 1
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fastybird/devices-module",
-  "version": "0.2.17",
+  "version": "0.2.18",
   "description": "Devices module data model plugin",
   "keywords": [
     "devices",