diff --git a/resumes/api/schemas.py b/resumes/api/schemas.py index 72c01a2..be78177 100644 --- a/resumes/api/schemas.py +++ b/resumes/api/schemas.py @@ -22,19 +22,19 @@ class ResumeBasicOut(Schema): job_status: Optional[str] work_1_experience: Optional[str] - work_1_time: Optional[datetime] + work_1_time: Optional[str] work_1_description: Optional[str] work_2_experience: Optional[str] - work_2_time: Optional[datetime] + work_2_time: Optional[str] work_2_description: Optional[str] work_3_experience: Optional[str] - work_3_time: Optional[datetime] + work_3_time: Optional[str] work_3_description: Optional[str] work_4_experience: Optional[str] - work_4_time: Optional[datetime] + work_4_time: Optional[str] work_4_description: Optional[str] height: Optional[int] diff --git a/resumes/api/views.py b/resumes/api/views.py index 828fcb8..77a10b5 100644 --- a/resumes/api/views.py +++ b/resumes/api/views.py @@ -11,6 +11,8 @@ def list_resumes( job_status: Optional[str] = Query(None), age: Optional[int] = Query(None), name: Optional[str] = Query(None), + source_id: Optional[int] = Query(None), + keyword: Optional[str] = Query(None), limit: int = 10, offset: int = 0 ): @@ -22,7 +24,10 @@ def list_resumes( qs = qs.filter(age=age) if name: qs = qs.filter(name__icontains=name) - + if source_id: + qs = qs.filter(source_id=source_id) + if keyword: + qs = qs.filter(crawl_keywords__icontains=keyword) total = qs.count() results = qs[offset:offset + limit]