Changed to work with request params find_group, get_user_token

Author: kompotkot

bugout/app.py

@@ -192,13 +192,13 @@ def get_group(
 
     def find_group(
         self,
+        token: Union[str, uuid.UUID],
         group_id: Optional[Union[str, uuid.UUID]] = None,
         name: Optional[str] = None,
-        token: Union[str, uuid.UUID] = None,
         timeout: float = REQUESTS_TIMEOUT,
     ) -> data.BugoutGroup:
         self.user.timeout = timeout
-        return self.group.find_group(group_id=group_id, name=name, token=token)
+        return self.group.find_group(token=token, group_id=group_id, name=name)
 
     def get_user_groups(
         self, token: Union[str, uuid.UUID], timeout: float = REQUESTS_TIMEOUT

bugout/group.py

@@ -49,21 +49,29 @@ def get_group(
 
     def find_group(
         self,
+        token: Union[str, uuid.UUID],
         group_id: Optional[Union[str, uuid.UUID]] = None,
         name: Optional[str] = None,
-        token: Union[str, uuid.UUID] = None,
     ) -> BugoutGroup:
         find_group_path = f"group/find"
-        if group_id is not None and name is None:
-            find_group_path += f"?group_id={group_id}"
-        elif group_id is None and name is not None:
-            find_group_path += f"?name={name}"
-        elif group_id is not None and name is not None:
-            find_group_path += f"?group_id={group_id}&name={name}"
+        if group_id is None and name is None:
+            raise GroupInvalidParameters(
+                "In order to find group, at least one of name, or id must be specified"
+            )
+        query_params = {}
+        if group_id is not None:
+            query_params.update({"group_id": group_id})
+        if name is not None:
+            query_params.update({"name": name})
         headers = {
             "Authorization": f"Bearer {token}",
         }
-        result = self._call(method=Method.get, path=find_group_path, headers=headers)
+        result = self._call(
+            method=Method.get,
+            path=find_group_path,
+            params=query_params,
+            headers=headers,
+        )
         return BugoutGroup(**result)
 
     def get_user_groups(self, token: Union[str, uuid.UUID]) -> BugoutUserGroups:

bugout/user.py

@@ -222,13 +222,15 @@ def get_user_tokens(
         headers = {
             "Authorization": f"Bearer {token}",
         }
-        if active is not None and token_type is None:
-            get_user_tokens_path += f"?active={active}"
-        elif active is None and token_type is not None:
-            get_user_tokens_path += f"?token_type={token_type.value}"
-        elif active is not None and token_type is not None:
-            get_user_tokens_path += f"?active={active}&token_type={token_type.value}"
+        query_params = {}
+        if active is not None:
+            query_params.update({"active": active})
+        if token_type is not None:
+            query_params.update({"token_type": token_type.value})
         result = self._call(
-            method=Method.get, path=get_user_tokens_path, headers=headers
+            method=Method.get,
+            path=get_user_tokens_path,
+            params=query_params,
+            headers=headers,
         )
         return BugoutUserTokens(**result)