Skip to content

Feature/search #124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rodzlen merged 2 commits into from
May 29, 2025
Merged

Feature/search #124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7fb10cd
🐛 search app 핋터링 쿼리 개선 및 공고 더미데이터 생성 10000개로 수정
rodzlen May 29, 2025
a13524c
🐛 공고 더미데이터 생성 스크립트 50000개로 수정
rodzlen May 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions search/generate_job_posting.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
TOWN_FIELD = "EMD_NAME" # 읍면동

# 3. 생성할 데이터 수
N = 1000
N = 50000

# 4. 직종, 교육, 요일, 급여 등 더미 값 목록
main_keywords = ["외식·음료"]
Expand All @@ -43,20 +43,17 @@
employment_types = ["정규직", "비정규직"]
experiences = ["경력", "무관"]

co = CompanyInfo.objects.first()
# 5. 특정 회사 UUID (고정값)
COMPANY_ID: uuid.UUID | Any = co.company_id if co else None
company = CompanyInfo.objects.get(company_id=COMPANY_ID)
companies = CompanyInfo.objects.all()


def run_dummy_job_posting():
created = 0

JobPosting.objects.all().delete()
while created < N:
polygon = gdf.sample(1).iloc[0]
try:
point = polygon.geometry.representative_point() # 중심 근처 랜덤 포인트

random_company = random.choice(companies)
JobPosting.objects.create(
job_posting_title=f"공고 {created+1}",
address="대한민국 어디쯤",
Expand All @@ -72,7 +69,7 @@ def run_dummy_job_posting():
job_keyword_main=random.choice(main_keywords),
job_keyword_sub=random.choice(sub_keywords),
number_of_positions=random.randint(1, 10),
company_id=company,
company_id=random_company,
education=random.choice(educations),
deadline=datetime.today().date() + timedelta(days=random.randint(1, 30)),
time_discussion=random.choice([True, False]),
Expand Down
9 changes: 4 additions & 5 deletions search/views/search_views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,8 @@ def get(self, request: HttpRequest) -> JsonResponse:
if query.town_no:
district_filter |= Q(emd_no__in=query.town_no)

districts = District.objects.filter(district_filter).distinct()
# 지역 객체 조회
districts = District.objects.filter(district_filter)

# 변환 매핑 생성
city_code_to_name = {d.city_no: d.city_name for d in districts}
Expand All @@ -89,12 +90,10 @@ def get(self, request: HttpRequest) -> JsonResponse:
qs = qs.filter(city__in=city_code_to_name.values())
if query.district_no:
qs = qs.filter(district__in=district_code_to_name.values())
if query.town_no:
qs = qs.filter(town__in=town_code_to_name.values())
# 6. 공간 필터링 (읍면동 기준, 3km 반경)
if query.town_no and district_filter:
buffered_regions = []
districts_to_buffer = District.objects.filter(district_filter)
districts_to_buffer = districts
for district in districts_to_buffer:
if district.geometry:
buffered_regions.append(district.geometry.buffer(3000))
Expand All @@ -110,7 +109,7 @@ def get(self, request: HttpRequest) -> JsonResponse:

# 7. 북마크 여부
if current_user:
bookmarked_qs = JobPostingBookmark.objects.filter(
bookmarked_qs = JobPostingBookmark.objects.select_related("user_id").filter(
user_id=current_user.common_user_id,
job_posting_id=OuterRef("pk"),
)
Expand Down