Added leftServer handling to members list #130

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

@@ -86,6 +86,17 @@ class User(TableABC):
     def server(self) -> Optional[Server]:
         return self._server
 
+    @property
+    @ServiceProviderABC.inject
+    def left_server(
+        self,
+        services: ServiceProviderABC,
+    ) -> bool:
+        from bot_data.abc.user_joined_server_repository_abc import UserJoinedServerRepositoryABC
+
+        ujs: UserJoinedServerRepositoryABC = services.get_service(UserJoinedServerRepositoryABC)
+        return ujs.find_active_user_joined_server_by_user_id(self.id) is None
+
     @staticmethod
     def get_select_all_string() -> str:
         return str(

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

@@ -31,7 +31,9 @@ class ServerFilter(FilterABC):
             query = query.where(lambda x: x.id == self._id)
 
         if self._discord_id is not None:
-            query = query.where(lambda x: x.discord_id == self._discord_id)
+            query = query.where(
+                lambda x: x.discord_id == self._discord_id or str(self._discord_id) in str(x.discord_id)
+            )
 
         if self._name is not None:
 

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

@@ -73,7 +73,7 @@ class UserFilter(FilterABC):
 
     def filter(self, query: List[User]) -> List[User]:
         if self._id is not None:
-            query = query.where(lambda x: x.id == self._id or str(self._id) in str(x.id))
+            query = query.where(lambda x: x.id == self._id)
 
         if self._discord_id is not None:
             query = query.where(

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

@@ -91,5 +91,6 @@ class UserQuery(DataQueryABC):
     def resolve_server(user: User, *_):
         return user.server
 
-    def resolve_left_server(self, user: User, *_):
-        return self._ujs.find_active_user_joined_server_by_user_id(user.id) is None
+    @staticmethod
+    def resolve_left_server(user: User, *_):
+        return user.left_server