From 3b702aac2cfcfc1ca8fedb0ccc53b89a07a42cf8 Mon Sep 17 00:00:00 2001
From: UpstreamData <brett@upstreamdata.ca>
Date: Wed, 25 May 2022 14:01:52 -0600
Subject: [PATCH] improved handling of MinerData by improving dataclass

---
 data/__init__.py | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/data/__init__.py b/data/__init__.py
index 84a52c24..3cde8219 100644
--- a/data/__init__.py
+++ b/data/__init__.py
@@ -1,4 +1,4 @@
-from dataclasses import dataclass
+from dataclasses import dataclass, field, asdict
 
 
 @dataclass
@@ -13,15 +13,37 @@ class MinerData:
     left_chips: int = 0
     center_chips: int = 0
     right_chips: int = 0
+    total_chips: int = field(init=False)
+    nominal: int = field(init=False)
     pool_split: str = 0
     pool_1_url: str = "Unknown"
     pool_1_user: str = "Unknown"
     pool_2_url: str = ""
     pool_2_user: str = ""
 
+    @property
+    def total_chips(self):  # noqa - Skip PyCharm inspection
+        return self.right_chips + self.center_chips + self.left_chips
+
+    @total_chips.setter
+    def total_chips(self, val):
+        pass
+
+    @property
+    def nominal(self):  # noqa - Skip PyCharm inspection
+        return self.ideal_chips == self.total_chips
+
+    @nominal.setter
+    def nominal(self, val):
+        pass
+
     def __post_init__(self):
         self.total_chips = self.right_chips + self.center_chips + self.left_chips
         self.nominal = self.ideal_chips == self.total_chips
 
     def asdict(self):
-        return {k: v for k, v in self.__dict__.items()}
+        return asdict(self)
+
+
+if __name__ == "__main__":
+    print(MinerData(ip="192.168.1.1").asdict())