remove postal code (#17)

* fix: remove postal code
Bunsly · Aug 27, 2023 · 33f6768 · 33f6768
1 parent d72d14d
commit 33f6768
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 21 deletions.
diff --git a/README.md b/README.md
@@ -53,8 +53,6 @@ site_type (enum)
     │       │   ├── country (str)
     │       │   ├── city (str)
     │       │   ├── state (str)
-    │       │   ├── postal_code (str)
-    │       │   └── address (str)
     │       ├── description (str)
     │       ├── job_type (enum)
     │       ├── compensation (object)
@@ -79,11 +77,9 @@ site_type (enum)
                 "company_name": "INTEL",
                 "job_url": "https://www.indeed.com/jobs/viewjob?jk=a2cfbb98d2002228",
                 "location": {
-                    "country": "US",
+                    "country": "USA",
                     "city": "Austin",
                     "state": "TX",
-                    "postal_code": null,
-                    "address": null
                 },
                 "description": "Job Description Designs, develops, tests, and debugs..."
                 "job_type": "fulltime",
@@ -95,7 +91,10 @@ site_type (enum)
                 },
                 "date_posted": "2023-08-18T00:00:00"
             }, ...
-          ]
+        ],
+        "total_results": 845,
+        "returned_results": 15
+    },
     "linkedin": {
         "success": true,
         "error": null,
@@ -105,11 +104,9 @@ site_type (enum)
                 "company_name": "Public Partnerships | PPL",
                 "job_url": "https://www.linkedin.com/jobs/view/3690013792",
                 "location": {
-                    "country": "US",
+                    "country": "USA",
                     "city": "Austin",
                     "state": "TX",
-                    "postal_code": null,
-                    "address": null
                 },
                 "description": "Public Partnerships LLC supports individuals with disabilities..."
                 "job_type": null,

diff --git a/api/core/jobs/__init__.py b/api/core/jobs/__init__.py
@@ -19,11 +19,9 @@ class JobType(Enum):
 
 
 class Location(BaseModel):
-    country: str
+    country: str = "USA"
     city: str = None
     state: str = None
-    postal_code: str = None
-    address: str = None
 
 
 class CompensationInterval(Enum):
@@ -38,7 +36,7 @@ class Compensation(BaseModel):
     interval: CompensationInterval
     min_amount: float
     max_amount: float
-    currency: str = "US"
+    currency: str = "USA"
 
 
 class JobPost(BaseModel):

diff --git a/api/core/scrapers/indeed/__init__.py b/api/core/scrapers/indeed/__init__.py
@@ -125,7 +125,6 @@ def process_job(job) -> Optional[JobPost]:
                     city=job.get("jobLocationCity"),
                     state=job.get("jobLocationState"),
                     postal_code=job.get("jobLocationPostal"),
-                    country="US",
                 ),
                 job_type=job_type,
                 compensation=compensation,

diff --git a/api/core/scrapers/linkedin/__init__.py b/api/core/scrapers/linkedin/__init__.py
@@ -167,9 +167,6 @@ def get_location(metadata_card: Optional[Tag]) -> Location:
         :param metadata_card
         :return: location
         """
-        location = Location(
-            country="US",
-        )
         if metadata_card is not None:
             location_tag = metadata_card.find(
                 "span", class_="job-search-card__location"
@@ -179,7 +176,6 @@ def get_location(metadata_card: Optional[Tag]) -> Location:
             if len(parts) == 2:
                 city, state = parts
                 location = Location(
-                    country="US",
                     city=city,
                     state=state,
                 )

diff --git a/api/core/scrapers/ziprecruiter/__init__.py b/api/core/scrapers/ziprecruiter/__init__.py
@@ -292,7 +292,6 @@ def get_location(job: BeautifulSoup) -> Location:
         else:
             city, state = None, None
         return Location(
-            country="US",
             city=city,
             state=state,
         )

diff --git a/api/v1/jobs/__init__.py b/api/v1/jobs/__init__.py
@@ -23,14 +23,17 @@ async def scrape_jobs(scraper_input: ScraperInput) -> Dict[str, JobResponse]:
     :param scraper_input:
     :return: Dict[str, JobResponse]: where each key is a site
     """
+
     def scrape_site(site: Site) -> Tuple[str, JobResponse]:
         scraper_class = SCRAPER_MAPPING[site]
         scraper = scraper_class()
         scraped_data = scraper.scrape(scraper_input)
         return (site.value, scraped_data)
 
     with ThreadPoolExecutor() as executor:
-        resp_dict = {site: resp for site, resp in executor.map(scrape_site, scraper_input.site_type)}
+        resp_dict = {
+            site: resp
+            for site, resp in executor.map(scrape_site, scraper_input.site_type)
+        }
 
     return resp_dict
-