From a0957f1d5b60cd9b0bbaa680710f15835ca197c8 Mon Sep 17 00:00:00 2001 From: Cullen Watson Date: Mon, 10 Jul 2023 18:17:46 -0500 Subject: [PATCH 1/2] refactor(jobs): use JobResponse model for bad requests --- api/auth/auth_utils.py | 1 - api/core/scrapers/indeed/__init__.py | 7 ++++--- api/core/scrapers/linkedin/__init__.py | 8 +++++--- api/core/scrapers/ziprecruiter/__init__.py | 7 ++++--- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/api/auth/auth_utils.py b/api/auth/auth_utils.py index 12710a8..b9fdfbc 100644 --- a/api/auth/auth_utils.py +++ b/api/auth/auth_utils.py @@ -13,7 +13,6 @@ oauth2_scheme = OAuth2PasswordBearer(tokenUrl="/api/auth/token") def create_access_token(data: dict): - print(JWT_SECRET_KEY) to_encode = data.copy() expire = datetime.utcnow() + timedelta(minutes=ACCESS_TOKEN_EXPIRE_MINUTES) to_encode.update({"exp": expire}) diff --git a/api/core/scrapers/indeed/__init__.py b/api/core/scrapers/indeed/__init__.py index 1138639..9004b4b 100644 --- a/api/core/scrapers/indeed/__init__.py +++ b/api/core/scrapers/indeed/__init__.py @@ -35,9 +35,10 @@ class IndeedScraper(Scraper): response = session.get(self.url, params=params) if response.status_code != status.HTTP_200_OK: - raise HTTPException( - status_code=status.HTTP_400_BAD_REQUEST, - detail=f"Response returned {response.status_code}", + return JobResponse( + success=False, + error=f"Response returned {response.status_code}", + http_response_code=response.status_code ) soup = BeautifulSoup(response.content, "html.parser") diff --git a/api/core/scrapers/linkedin/__init__.py b/api/core/scrapers/linkedin/__init__.py index a28c9c3..e403366 100644 --- a/api/core/scrapers/linkedin/__init__.py +++ b/api/core/scrapers/linkedin/__init__.py @@ -26,10 +26,12 @@ class LinkedInScraper(Scraper): self.url = f"{self.url}/{scraper_input.search_term}-jobs" response = requests.get(self.url, params=params) + response.status_code = 300 if response.status_code != status.HTTP_200_OK: - raise HTTPException( - status_code=status.HTTP_400_BAD_REQUEST, - detail=f"Response returned {response.status_code} {response.reason}", + return JobResponse( + success=False, + error=f"Response returned {response.status_code}", + http_response_code=response.status_code ) soup = BeautifulSoup(response.text, "html.parser") diff --git a/api/core/scrapers/ziprecruiter/__init__.py b/api/core/scrapers/ziprecruiter/__init__.py index 0cee62d..cdb495b 100644 --- a/api/core/scrapers/ziprecruiter/__init__.py +++ b/api/core/scrapers/ziprecruiter/__init__.py @@ -34,9 +34,10 @@ class ZipRecruiterScraper(Scraper): self.url, headers=ZipRecruiterScraper.headers(), params=params ) if response.status_code != status.HTTP_200_OK: - raise HTTPException( - status_code=status.HTTP_400_BAD_REQUEST, - detail=f"Response returned {response.status_code} {response.reason}", + return JobResponse( + success=False, + error=f"Response returned {response.status_code}", + http_response_code=response.status_code ) html_string = response.content From bdc7ce1df2566e4993e0ae8f52aa3c369d592302 Mon Sep 17 00:00:00 2001 From: Cullen Watson Date: Mon, 10 Jul 2023 18:19:37 -0500 Subject: [PATCH 2/2] refactor(jobs): use JobResponse model for bad requests --- api/core/scrapers/linkedin/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/core/scrapers/linkedin/__init__.py b/api/core/scrapers/linkedin/__init__.py index e403366..b22a63b 100644 --- a/api/core/scrapers/linkedin/__init__.py +++ b/api/core/scrapers/linkedin/__init__.py @@ -26,7 +26,7 @@ class LinkedInScraper(Scraper): self.url = f"{self.url}/{scraper_input.search_term}-jobs" response = requests.get(self.url, params=params) - response.status_code = 300 + if response.status_code != status.HTTP_200_OK: return JobResponse( success=False,