Added history for achievements to frontend #268_achievements

kdb-bot/src/bot_data/migration/achievements_migration.py

@@ -40,11 +40,11 @@ class AchievementsMigration(MigrationABC):
                     CREATE TABLE IF NOT EXISTS `AchievementsHistory`
                     (
                         `Id`    BIGINT(20)  NOT NULL,
-                        `ServerId` BIGINT,
                         `Name` VARCHAR(255) NOT NULL,
                         `Attribute` VARCHAR(255) NOT NULL,
                         `Operator` VARCHAR(255) NOT NULL,
                         `Value` VARCHAR(255) NOT NULL,
+                        `ServerId` BIGINT,
                         `Deleted`   BOOL DEFAULT FALSE,
                         `DateFrom`  DATETIME(6) NOT NULL,
                         `DateTo`    DATETIME(6) NOT NULL

kdb-bot/src/bot_data/model/achievement_history.py

@@ -1,20 +1,14 @@
-from datetime import datetime
-from typing import Optional
-
-from cpl_core.database import TableABC
-
 from bot_data.abc.history_table_abc import HistoryTableABC
-from bot_data.model.server import Server
 
 
-class Achievement(HistoryTableABC):
+class AchievementHistory(HistoryTableABC):
     def __init__(
         self,
         name: str,
         attribute: str,
         operator: str,
         value: str,
-        server: Optional[Server],
+        server: int,
         deleted: bool,
         date_from: str,
         date_to: str,
@@ -41,26 +35,18 @@ class Achievement(HistoryTableABC):
     def name(self) -> str:
         return self._name
 
-    @name.setter
-    def name(self, value: str):
-        self._name = value
+    @property
+    def attribute(self) -> str:
+        return self._attribute
 
     @property
     def operator(self) -> str:
         return self._operator
 
-    @operator.setter
-    def operator(self, value: str):
-        self._operator = value
-
     @property
     def value(self) -> str:
         return self._value
 
-    @value.setter
-    def value(self, value: str):
-        self._value = value
-
     @property
-    def server(self) -> Server:
+    def server(self) -> int:
         return self._server

kdb-bot/src/bot_data/model/user_history.py

@@ -9,6 +9,8 @@ class UserHistory(HistoryTableABC):
         self,
         dc_id: int,
         xp: int,
+        message_count: int,
+        reaction_count: int,
         server: int,
         deleted: bool,
         date_from: str,
@@ -20,6 +22,8 @@ class UserHistory(HistoryTableABC):
         self._user_id = id
         self._discord_id = dc_id
         self._xp = xp
+        self._message_count = message_count
+        self._reaction_count = reaction_count
         self._server = server
 
         self._deleted = deleted
@@ -38,6 +42,14 @@ class UserHistory(HistoryTableABC):
     def xp(self) -> int:
         return self._xp
 
+    @property
+    def message_count(self) -> int:
+        return self._message_count
+
+    @property
+    def reaction_count(self) -> int:
+        return self._reaction_count
+
     @property
     def server(self) -> int:
         return self._server