Another code reverting

FastyBird · Sep 2, 2021 · b93e422 · b93e422
1 parent 46d4dc2
commit b93e422
Show file tree

Hide file tree

Showing 3 changed files with 83 additions and 41 deletions.
diff --git a/devices_module/__init__.py b/devices_module/__init__.py
@@ -16,4 +16,4 @@
 Devices module
 """
 
-__version__ = "0.2.28"
+__version__ = "0.2.29"
diff --git a/devices_module/models.py b/devices_module/models.py
@@ -41,36 +41,6 @@
 db: Database = Database()
 
 
-class EntityCreatedMixin:
-    """
-    Entity created field mixin
-
-    @package        FastyBird:DevicesModule!
-    @module         models
-
-    @author         Adam Kadlec <adam.kadlec@fastybird.com>
-    """
-    def before_insert(self) -> None:
-        """Before insert entity hook"""
-        if isinstance(self, orm.Entity):
-            self.set({"created_at": datetime.datetime.now()})
-
-
-class EntityUpdatedMixin:
-    """
-    Entity updated field mixin
-
-    @package        FastyBird:DevicesModule!
-    @module         models
-
-    @author         Adam Kadlec <adam.kadlec@fastybird.com>
-    """
-    def before_update(self) -> None:
-        """Before update entity hook"""
-        if isinstance(self, orm.Entity):
-            self.set({"updated_at": datetime.datetime.now()})
-
-
 class EntityEventMixin:
     """
     Entity event mixin
@@ -118,7 +88,7 @@ def after_delete(self) -> None:
             )
 
 
-class ConnectorEntity(EntityEventMixin, EntityCreatedMixin, EntityUpdatedMixin, db.Entity):
+class ConnectorEntity(EntityEventMixin, db.Entity):
     """
     Connector entity
 
@@ -174,6 +144,18 @@ def get_plain_controls(self) -> List[str]:
 
         return controls
 
+    # -----------------------------------------------------------------------------
+
+    def before_insert(self) -> None:
+        """Before insert entity hook"""
+        self.created_at = datetime.datetime.now()
+
+    # -----------------------------------------------------------------------------
+
+    def before_update(self) -> None:
+        """Before update entity hook"""
+        self.updated_at = datetime.datetime.now()
+
 
 class FbBusConnectorEntity(ConnectorEntity):
     """
@@ -284,7 +266,7 @@ def to_dict(
         }, **super().to_dict(only, exclude, with_collections, with_lazy, related_objects)}
 
 
-class ConnectorControlEntity(EntityCreatedMixin, EntityUpdatedMixin, db.Entity):
+class ConnectorControlEntity(db.Entity):
     """
     Connector control entity
 
@@ -302,8 +284,20 @@ class ConnectorControlEntity(EntityCreatedMixin, EntityUpdatedMixin, db.Entity):
 
     connector: ConnectorEntity = Required("ConnectorEntity", reverse="controls", column="connector_id", nullable=False)
 
+    # -----------------------------------------------------------------------------
+
+    def before_insert(self) -> None:
+        """Before insert entity hook"""
+        self.created_at = datetime.datetime.now()
+
+    # -----------------------------------------------------------------------------
+
+    def before_update(self) -> None:
+        """Before update entity hook"""
+        self.updated_at = datetime.datetime.now()
+
 
-class DeviceEntity(EntityEventMixin, EntityCreatedMixin, EntityUpdatedMixin, db.Entity):
+class DeviceEntity(EntityEventMixin, db.Entity):
     """
     Device entity
 
@@ -402,7 +396,7 @@ def get_plain_controls(self) -> List[str]:
 
     def before_insert(self) -> None:
         """Before insert entity hook"""
-        super().before_insert()
+        self.created_at = datetime.datetime.now()
 
         self.hardware_model = self.hardware_model.lower()
         self.hardware_manufacturer = self.hardware_manufacturer.lower()
@@ -412,7 +406,7 @@ def before_insert(self) -> None:
 
     def before_update(self) -> None:
         """Before update entity hook"""
-        super().before_update()
+        self.updated_at = datetime.datetime.now()
 
         self.hardware_model = self.hardware_model.lower()
         self.hardware_manufacturer = self.hardware_manufacturer.lower()
@@ -661,7 +655,7 @@ def to_dict(
         return structure
 
 
-class DeviceControlEntity(EntityCreatedMixin, EntityUpdatedMixin, db.Entity):
+class DeviceControlEntity(db.Entity):
     """
     Device control entity
 
@@ -679,8 +673,20 @@ class DeviceControlEntity(EntityCreatedMixin, EntityUpdatedMixin, db.Entity):
 
     device: DeviceEntity = Required("DeviceEntity", reverse="controls", column="device_id", nullable=False)
 
+    # -----------------------------------------------------------------------------
+
+    def before_insert(self) -> None:
+        """Before insert entity hook"""
+        self.created_at = datetime.datetime.now()
+
+    # -----------------------------------------------------------------------------
+
+    def before_update(self) -> None:
+        """Before update entity hook"""
+        self.updated_at = datetime.datetime.now()
 
-class DeviceConnectorEntity(EntityEventMixin, EntityCreatedMixin, EntityUpdatedMixin, db.Entity):
+
+class DeviceConnectorEntity(EntityEventMixin, db.Entity):
     """
     Device connector entity
 
@@ -733,8 +739,20 @@ def to_dict(
 
         return structure
 
+    # -----------------------------------------------------------------------------
+
+    def before_insert(self) -> None:
+        """Before insert entity hook"""
+        self.created_at = datetime.datetime.now()
+
+    # -----------------------------------------------------------------------------
+
+    def before_update(self) -> None:
+        """Before update entity hook"""
+        self.updated_at = datetime.datetime.now()
+
 
-class ChannelEntity(EntityEventMixin, EntityCreatedMixin, EntityUpdatedMixin, db.Entity):
+class ChannelEntity(EntityEventMixin, db.Entity):
     """
     Channel entity
 
@@ -792,6 +810,18 @@ def get_plain_controls(self) -> List[str]:
 
         return controls
 
+    # -----------------------------------------------------------------------------
+
+    def before_insert(self) -> None:
+        """Before insert entity hook"""
+        self.created_at = datetime.datetime.now()
+
+    # -----------------------------------------------------------------------------
+
+    def before_update(self) -> None:
+        """Before update entity hook"""
+        self.updated_at = datetime.datetime.now()
+
 
 class ChannelPropertyEntity(db.Entity):
     """
@@ -1035,7 +1065,7 @@ def to_dict(
         return structure
 
 
-class ChannelControlEntity(EntityCreatedMixin, EntityUpdatedMixin, db.Entity):
+class ChannelControlEntity(db.Entity):
     """
     Channel control entity
 
@@ -1053,6 +1083,18 @@ class ChannelControlEntity(EntityCreatedMixin, EntityUpdatedMixin, db.Entity):
 
     channel: ChannelEntity = Required("ChannelEntity", reverse="controls", column="channel_id", nullable=False)
 
+    # -----------------------------------------------------------------------------
+
+    def before_insert(self) -> None:
+        """Before insert entity hook"""
+        self.created_at = datetime.datetime.now()
+
+    # -----------------------------------------------------------------------------
+
+    def before_update(self) -> None:
+        """Before update entity hook"""
+        self.updated_at = datetime.datetime.now()
+
 
 class PropertiesRepository(ABC):
     """

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@fastybird/devices-module",
-  "version": "0.2.28",
+  "version": "0.2.29",
   "description": "Devices module data model plugin",
   "keywords": [
     "devices",