Merge pull request #149 from MicroPyramid/dev

enhancements

Author: ashwin31

search/forms.py

@@ -1,13 +1,19 @@
-from haystack.forms import SearchForm
+import datetime
+from datetime import date
+from dateutil.relativedelta import relativedelta
+
 from django import forms
-from haystack.query import SearchQuerySet
-from haystack.query import SQ
+from haystack.forms import SearchForm
+from haystack.query import SearchQuerySet, SQ
+
 from peeldb.models import City
 
-valid_time_formats = ["%Y-%m-%d 00:00:00"]
+VALID_TIME_FORMATS = ["%Y-%m-%d 00:00:00"]
 
 
-class job_searchForm(SearchForm):
+class JobSearchForm(SearchForm):
+    """Search form for filtering and query building on job listings."""
+
     q = forms.CharField(max_length=200, required=False)
     location = forms.CharField(required=False)
     experience = forms.IntegerField(required=False)
@@ -21,150 +27,121 @@ class job_searchForm(SearchForm):
     refine_location = forms.CharField(required=False)
 
     def search(self):
+        """
+        Build and return the search query based on form input.
 
-        # sqs = SearchQuerySet().models(JobPost).filter(status='Live')
-        sqs = SearchQuerySet()
-        sqs = sqs.filter_and(status="Live")
+        The search query filters live job posts and then applies
+        additional filters based on the form's cleaned_data.
+        """
+        sqs = SearchQuerySet().filter_and(status="Live")
         if not self.is_valid():
             return sqs
-        if self.cleaned_data["q"] and self.cleaned_data["location"]:
-            term = self.cleaned_data["q"]
-            term = term.replace("[", "")
-            term = term.replace("]", "")
-            term = term.replace("'", "")
-            # sqs = sqs.filter_and(SQ(title=term) | SQ(designation=term)| SQ(skills=term))
-            terms = [t.strip() for t in term.split(",")]
+
+        query = self.cleaned_data.get("q")
+        location_field = self.cleaned_data.get("location")
+        if query and location_field:
+            # Process basic query filters.
+            term = query.replace("[", "").replace("]", "").replace("'", "")
+            terms = [t.strip() for t in term.split(",") if t.strip()]
             sqs = sqs.filter_and(
                 SQ(title__in=terms) | SQ(designation__in=terms) | SQ(skills__in=terms)
             )
-            # sqs = sqs.filter_or(SQ(designation__in=terms))
-            # sqs = sqs.filter_or(SQ(skills__in=terms))
-            location = self.cleaned_data["location"]
-            location = location.replace("[", "")
-            location = location.replace("]", "")
-            location = location.replace("'", "")
-            locations = [t.strip() for t in location.split(",")]
+
+            loc = location_field.replace("[", "").replace("]", "").replace("'", "")
+            locations = [t.strip() for t in loc.split(",") if t.strip()]
             other_cities = City.objects.filter(name__in=locations).values_list(
                 "parent_city__name", flat=True
             )
             sqs = sqs.filter_and(
                 SQ(location__in=locations)
-                | SQ(location__startswith=self.cleaned_data["location"])
+                | SQ(location__startswith=location_field)
                 | SQ(location__in=other_cities)
             )
 
-            if self.cleaned_data["job_type"]:
+            if self.cleaned_data.get("job_type"):
                 sqs = sqs.filter_and(job_type=self.cleaned_data["job_type"])
 
-            if self.cleaned_data["industry"]:
-                term = self.cleaned_data["industry"]
-                # sqs = sqs.filter_and(SQ(title=term) | SQ(designation=term)| SQ(skills=term))
-                terms = [t.strip() for t in term.split(",")]
-                sqs = sqs.filter_or(industry__in=terms)
+            if self.cleaned_data.get("industry"):
+                industry_value = self.cleaned_data["industry"]
+                industries = [t.strip() for t in industry_value.split(",") if t.strip()]
+                sqs = sqs.filter_or(industry__in=industries)
 
-            if self.cleaned_data["functional_area"]:
-                term = self.cleaned_data["functional_area"]
-                # sqs = sqs.filter_and(SQ(title=term) | SQ(designation=term)| SQ(skills=term))
-                terms = [t.strip() for t in term.split(",")]
-                sqs = sqs.filter_or(functional_area__in=terms)
+            if self.cleaned_data.get("functional_area"):
+                fa_value = self.cleaned_data["functional_area"]
+                functional_areas = [
+                    t.strip() for t in fa_value.split(",") if t.strip()
+                ]
+                sqs = sqs.filter_or(functional_area__in=functional_areas)
 
-            if self.cleaned_data["experience"] or self.cleaned_data["experience"] == 0:
+            if self.cleaned_data.get("experience") is not None:
+                experience_val = self.cleaned_data["experience"]
                 sqs = sqs.filter_or(
-                    SQ(max_experience__gte=self.cleaned_data["experience"])
-                    & SQ(min_experience__lte=self.cleaned_data["experience"])
+                    SQ(max_experience__gte=experience_val)
+                    & SQ(min_experience__lte=experience_val)
                 )
 
-            if self.cleaned_data["salary"]:
+            if self.cleaned_data.get("salary") is not None:
+                salary_val = self.cleaned_data["salary"]
                 sqs = sqs.filter_or(
-                    SQ(max_salary__gte=self.cleaned_data["salary"])
-                    & SQ(min_salary__lte=self.cleaned_data["salary"])
+                    SQ(max_salary__gte=salary_val)
+                    & SQ(min_salary__lte=salary_val)
                 )
-            if self.cleaned_data["walkin_type"]:
-                import datetime
-
-                if self.cleaned_data["walkin_type"] == "this_week":
-                    date = datetime.date.today()
-                    start_week = (
-                        date
-                        - datetime.timedelta(date.weekday())
-                        - datetime.timedelta(1)
-                    )
+
+            walkin_type = self.cleaned_data.get("walkin_type")
+            if walkin_type:
+                if walkin_type == "this_week":
+                    today = date.today()
+                    start_week = today - datetime.timedelta(today.weekday()) - datetime.timedelta(1)
                     end_week = start_week + datetime.timedelta(6)
-                    start_week = datetime.datetime.strptime(
-                        str(start_week), "%Y-%m-%d"
-                    ).strftime("%Y-%m-%d")
-                    end_week = datetime.datetime.strptime(
-                        str(end_week), "%Y-%m-%d"
-                    ).strftime("%Y-%m-%d")
+                    start_str = start_week.strftime("%Y-%m-%d")
+                    end_str = end_week.strftime("%Y-%m-%d")
                     sqs = sqs.filter_and(
-                        SQ(walkin_from_date__range=[start_week, end_week])
-                        | SQ(walkin_to_date__range=[start_week, end_week])
-                    )
-                if self.cleaned_data["walkin_type"] == "next_week":
-                    date = datetime.date.today()
-                    start_week = (
-                        date
-                        - datetime.timedelta(date.isoweekday())
-                        + datetime.timedelta(7)
+                        SQ(walkin_from_date__range=[start_str, end_str])
+                        | SQ(walkin_to_date__range=[start_str, end_str])
                     )
+                elif walkin_type == "next_week":
+                    today = date.today()
+                    start_week = today - datetime.timedelta(today.isoweekday()) + datetime.timedelta(7)
                     end_week = start_week + datetime.timedelta(6)
-                    start_week = datetime.datetime.strptime(
-                        str(start_week), "%Y-%m-%d"
-                    ).strftime("%Y-%m-%d")
-                    end_week = datetime.datetime.strptime(
-                        str(end_week), "%Y-%m-%d"
-                    ).strftime("%Y-%m-%d")
+                    start_str = start_week.strftime("%Y-%m-%d")
+                    end_str = end_week.strftime("%Y-%m-%d")
                     sqs = sqs.filter_and(
-                        SQ(walkin_from_date__range=[start_week, end_week])
-                        | SQ(walkin_to_date__range=[start_week, end_week])
+                        SQ(walkin_from_date__range=[start_str, end_str])
+                        | SQ(walkin_to_date__range=[start_str, end_str])
                     )
-
-                    # sqs = sqs.filter_and(SQ(walkin_from_date__range=[start_week, end_week]) | SQ(walkin_to_date__range=[start_week, end_week]))
-                if self.cleaned_data["walkin_type"] == "this_month":
-                    current_date = datetime.date.today()
-                    from dateutil.relativedelta import relativedelta
-                    from datetime import date
-
-                    start_week = date(current_date.year, current_date.month, 1)
-                    end_week = start_week + relativedelta(day=31)
-                    start_week = datetime.datetime.strptime(
-                        str(start_week), "%Y-%m-%d"
-                    ).strftime("%Y-%m-%d")
-                    end_week = datetime.datetime.strptime(
-                        str(end_week), "%Y-%m-%d"
-                    ).strftime("%Y-%m-%d")
+                elif walkin_type == "this_month":
+                    current_date = date.today()
+                    start_month = date(current_date.year, current_date.month, 1)
+                    end_month = start_month + relativedelta(day=31)
+                    start_str = start_month.strftime("%Y-%m-%d")
+                    end_str = end_month.strftime("%Y-%m-%d")
                     sqs = sqs.filter_and(
-                        SQ(walkin_from_date__range=[start_week, end_week])
-                        | SQ(walkin_to_date__range=[start_week, end_week])
+                        SQ(walkin_from_date__range=[start_str, end_str])
+                        | SQ(walkin_to_date__range=[start_str, end_str])
                     )
-                # if self.cleaned_data['walkin_type'] == 'next_month':
-                #     pass
-                if self.cleaned_data["walkin_type"] == "custom_range":
-                    if self.cleaned_data["walkin_from_date"]:
-                        walkin_from_date = datetime.datetime.strptime(
-                            str(self.cleaned_data["walkin_from_date"]), "%Y-%m-%d"
-                        ).strftime("%Y-%m-%d")
+                elif walkin_type == "custom_range":
+                    if self.cleaned_data.get("walkin_from_date"):
+                        walkin_from = self.cleaned_data["walkin_from_date"].strftime(
+                            "%Y-%m-%d"
+                        )
                         sqs = sqs.filter_and(
-                            SQ(walkin_from_date__gte=walkin_from_date)
-                            | SQ(walkin_to_date__gte=walkin_from_date)
+                            SQ(walkin_from_date__gte=walkin_from)
+                            | SQ(walkin_to_date__gte=walkin_from)
+                        )
+                    if self.cleaned_data.get("walkin_to_date"):
+                        walkin_to = self.cleaned_data["walkin_to_date"].strftime(
+                            "%Y-%m-%d"
                         )
-                    if self.cleaned_data["walkin_to_date"]:
-                        walkin_to_date = datetime.datetime.strptime(
-                            str(self.cleaned_data["walkin_to_date"]), "%Y-%m-%d"
-                        ).strftime("%Y-%m-%d")
                         sqs = sqs.filter_and(
-                            SQ(walkin_from_date__gte=walkin_to_date)
-                            | SQ(walkin_to_date__lte=walkin_to_date)
+                            SQ(walkin_from_date__gte=walkin_to)
+                            | SQ(walkin_to_date__lte=walkin_to)
                         )
             return sqs
-        else:
-            return []
+        return []
 
     def query(self):
-        if self.cleaned_data["q"]:
-            return self.cleaned_data["q"]
-        return None
-
-
-# 13-11-2014
-# 20-11-2014 29-11-2014
+        """
+        Return the query string if provided; otherwise, return None.
+        """
+        q_value = self.cleaned_data.get("q")
+        return q_value if q_value else None

search/templatetags/searchtags.py

@@ -1,5 +1,5 @@
 from django import template
-from search.forms import job_searchForm
+from search.forms import JobSearchForm
 from peeldb.models import JOB_TYPE
 from peeldb.models import WALKIN_TYPE
 
@@ -8,7 +8,7 @@
 
 @register.inclusion_tag("search/search_filter.html", takes_context=True)
 def show_search_filter(context):
-    search_form = job_searchForm()
+    search_form = JobSearchForm()
     return {
         "request": context["request"],
         "search_form": search_form,
@@ -25,7 +25,7 @@ def show_search_filter(context):
 
 @register.inclusion_tag("search/adv_search_filter.html", takes_context=True)
 def show_adv_search_filter(context):
-    search_form = job_searchForm()
+    search_form = JobSearchForm()
 
     return {
         "request": context["request"],
@@ -37,7 +37,7 @@ def show_adv_search_filter(context):
 
 @register.inclusion_tag("mobile/search/search_filter.html", takes_context=True)
 def show_mobile_search_filter(context):
-    search_form = job_searchForm()
+    search_form = JobSearchForm()
     return {
         "request": context["request"],
         "search_form": search_form,

search/views.py

@@ -30,7 +30,7 @@
 )
 from pjob.refine_search import refined_search
 from pjob.views import get_page_number
-from search.forms import job_searchForm
+from search.forms import JobSearchForm
 from dashboard.tasks import save_search_results
 
 
@@ -98,7 +98,7 @@
 
 
 def custom_search(data, request):
-    form = job_searchForm(data)
+    form = JobSearchForm(data)
     searched_locations = searched_skills = searched_edu = searched_industry = (
         searched_states
     ) = ""

social/tasks.py

@@ -1,6 +1,5 @@
 from jobsp.celery import app
 from mpcomp.facebook import GraphAPI
-import celery
 import requests
 from django.conf import settings
 from peeldb.models import (
@@ -11,7 +10,6 @@
     TwitterFollower,
     TwitterFriend,
 )
-from mpcomp import gauth, contacts
 
 
 @app.task()