Merge pull request #57 from bugout-dev/find-user-extend

Find user by id, email, username and application id

Author: kompotkot

bugout/__init__.py

@@ -8,7 +8,7 @@
 
 __email__ = "engineering@bugout.dev"
 __license__ = "MIT"
-__version__ = "0.2.15"
+__version__ = "0.2.16"
 
 __all__ = (
     "__author__",

bugout/app.py

@@ -90,13 +90,23 @@ def get_user_by_id(
 
     def find_user(
         self,
-        username: str,
+        user_id: Optional[Union[str, uuid.UUID]] = None,
+        email: Optional[str] = None,
+        username: Optional[str] = None,
+        application_id: Optional[Union[str, uuid.UUID]] = None,
         token: Optional[Union[str, uuid.UUID]] = None,
         timeout: float = REQUESTS_TIMEOUT,
         **kwargs: Dict[str, Any],
     ) -> data.BugoutUser:
         self.user.timeout = timeout
-        return self.user.find_user(username=username, token=token, **kwargs)
+        return self.user.find_user(
+            user_id=user_id,
+            email=email,
+            username=username,
+            application_id=application_id,
+            token=token,
+            **kwargs,
+        )
 
     def confirm_email(
         self,

bugout/calls.py

@@ -17,13 +17,13 @@ def make_request(method: Method, url: str, **kwargs) -> Any:
             raise BugoutResponseException(
                 "Network error", status_code=599, detail=str(err)
             )
-        if r.headers.get("Content-Type") == "application/json":
-            exception_detail = r.json()["detail"]
+        if r.headers.get("Content-Type") == "application/json":  # type: ignore
+            exception_detail = r.json()["detail"]  # type: ignore
         else:
-            exception_detail = r.text
+            exception_detail = r.text  # type: ignore
         raise BugoutResponseException(
             "An exception occurred at Bugout API side",
-            status_code=r.status_code,
+            status_code=r.status_code,  # type: ignore
             detail=exception_detail,
         )
     except Exception as e:

bugout/jobs.py

@@ -181,9 +181,11 @@ def list_jobs(
         results = [
             BugoutSearchResultWithEntryID(
                 **dict(raw_result),
-                id=raw_result.entry_url.split("/")[-1]
-                if isinstance(raw_result, BugoutSearchResult)
-                else raw_result.entity_url.split("/")[-1],
+                id=(
+                    raw_result.entry_url.split("/")[-1]
+                    if isinstance(raw_result, BugoutSearchResult)
+                    else raw_result.entity_url.split("/")[-1]
+                ),
             )
             for raw_result in job_results.results
         ]

bugout/user.py

@@ -86,17 +86,33 @@ def get_user_by_id(
 
     def find_user(
         self,
-        username: str,
+        user_id: Optional[Union[str, uuid.UUID]] = None,
+        email: Optional[str] = None,
+        username: Optional[str] = None,
+        application_id: Optional[Union[str, uuid.UUID]] = None,
         token: Optional[Union[str, uuid.UUID]] = None,
         **kwargs: Dict[str, Any],
     ) -> BugoutUser:
-        find_user_path = f"user/find?username={username}"
+        find_user_path = f"user/find"
+
+        query_params = {}
+        if user_id is not None:
+            query_params.update({"user_id": str(user_id)})
+        if email is not None:
+            query_params.update({"email": email})
+        if username is not None:
+            query_params.update({"username": username})
+        if application_id is not None:
+            query_params.update({"application_id": str(application_id)})
+
         headers = {}
         if token is not None:
             headers.update({"Authorization": f"Bearer {token}"})
         if "headers" in kwargs.keys():
             headers.update(kwargs["headers"])
-        result = self._call(method=Method.get, path=find_user_path, headers=headers)
+        result = self._call(
+            method=Method.get, path=find_user_path, params=query_params, headers=headers
+        )
         return BugoutUser(**result)
 
     def confirm_email(