Added minecraft id #181

kdb-bot/src/bot_graphql/filter/user_filter.py

@@ -30,6 +30,7 @@ class UserFilter(FilterABC):
         self._discord_id = None
         self._name = None
         self._xp = None
+        self._minecraft_id = None
         self._ontime = None
         self._level: Optional[LevelFilter] = None
 
@@ -46,6 +47,9 @@ class UserFilter(FilterABC):
         if "xp" in values:
             self._xp = int(values["xp"])
 
+        if "minecraftId" in values:
+            self._minecraft_id = values["minecraftId"]
+
         if "ontime" in values:
             self._ontime = int(values["ontime"])
 
@@ -75,6 +79,9 @@ class UserFilter(FilterABC):
         if self._xp is not None:
             query = query.where(lambda x: x.xp == self._xp)
 
+        if self._minecraft_id is not None:
+            query = query.where(lambda x: x.minecraft_id == self._minecraft_id)
+
         if self._ontime is not None:
             query = query.where(lambda x: self._client_utils.get_ontime_for_user(x) == self._ontime)
 

kdb-bot/src/bot_graphql/model/user.gql

@@ -3,6 +3,7 @@ type User implements TableQuery {
     discordId: String
     name: String
     xp: Int
+    minecraftId: String
     ontime: Float
     level: Level
 
@@ -26,6 +27,7 @@ input UserFilter {
     discordId: String
     name: String
     xp: Int
+    minecraftId: String
     ontime: Float
     level: LevelFilter
     server: ServerFilter

kdb-bot/src/bot_graphql/queries/user_query.py

@@ -35,6 +35,7 @@ class UserQuery(DataQueryABC):
         self.set_field("discordId", self.resolve_discord_id)
         self.set_field("name", self.resolve_name)
         self.set_field("xp", self.resolve_xp)
+        self.set_field("minecraftId", self.resolve_minecraft_id)
         self.set_field("ontime", self.resolve_ontime)
         self.set_field("level", self.resolve_level)
         self.add_collection(
@@ -71,6 +72,10 @@ class UserQuery(DataQueryABC):
     def resolve_xp(user: User, *_):
         return user.xp
 
+    @staticmethod
+    def resolve_minecraft_id(user: User, *_):
+        return user.minecraft_id
+
     def resolve_ontime(self, user: User, *_):
         return self._client_utils.get_ontime_for_user(user)