Feat: update search to city and property based dropdown

Implement city and property category dropdown for search instead of normal string search. City dropdown was added earlier, property category dropdown is added in this commit

Author: MuhammedNihad

realtoric/core/forms.py

@@ -4,12 +4,28 @@
 
 
 class SearchForm(forms.Form):
+    CATEGORY_CHOICES = (
+        ("", "Choose property category"),
+        ("Apartment", "Apartments"),
+        ("Commercial", "Commercials"),
+        ("House", "Houses"),
+        ("Land", "Lands"),
+        ("Villa", "Villas"),
+    )
+
     city = forms.ModelChoiceField(
         queryset=City.objects.all(),
         widget=forms.Select(attrs={"class": "form-select-sm choose-city-dropdown"}),
         to_field_name="name",
-        empty_label="Cities",
+        empty_label="Choose City",
+        label="",
+    )
+
+    category = forms.ChoiceField(
+        choices=CATEGORY_CHOICES,
+        widget=forms.Select(attrs={"class": "form-select-sm choose-city-dropdown"}),
         label="",
+        required=True,
     )
 
 

realtoric/core/views.py

@@ -1,5 +1,3 @@
-from itertools import chain
-
 from django.contrib import messages
 from django.contrib.auth.mixins import LoginRequiredMixin
 from django.contrib.messages.views import SuccessMessageMixin
@@ -207,29 +205,31 @@ def get_queryset(self):
         Return search results.
         """
 
-        query = self.request.GET.get("search", None)
         city = self.request.GET.get("city", None)
+        category = self.request.GET.get("category", None)
 
-        if query and city:
-            apartment = Apartment.objects.filter(
-                Q(city__icontains=city) & Q(ad_title__icontains=query)
-            )
-            commercial = Commercial.objects.filter(
-                Q(city__icontains=city) & Q(ad_title__icontains=query)
-            )
-            house = House.objects.filter(
-                Q(city__icontains=city) & Q(ad_title__icontains=query)
-            )
-            land = Land.objects.filter(
-                Q(city__icontains=city) & Q(ad_title__icontains=query)
-            )
-            villa = Villa.objects.filter(
-                Q(city__icontains=city) & Q(ad_title__icontains=query)
-            )
+        if city and category:
+            if category == "Apartment":
+                apartment = Apartment.objects.filter(Q(city__icontains=city))
+                return apartment
 
-            return list(chain(apartment, commercial, house, land, villa))
+            elif category == "Commercial":
+                commercial = Commercial.objects.filter(Q(city__icontains=city))
+                return commercial
+
+            elif category == "House":
+                house = House.objects.filter(Q(city__icontains=city))
+                return house
+
+            elif category == "Land":
+                land = Land.objects.filter(Q(city__icontains=city))
+                return land
+
+            elif category == "Villa":
+                villa = Villa.objects.filter(Q(city__icontains=city))
+                return villa
         else:
-            messages.error(self.request, _("No results found."))
+            messages.error(self.request, _("Something went wrong."))
 
 
 property_search_results_view = PropertySearchResultsView.as_view()
@@ -468,7 +468,6 @@ def form_valid(self, form):
             )
         return super().form_valid(form)
 
-
     def get_success_url(self):
         return reverse("core:commercial_detail", kwargs={"slug": self.object.slug})
 
@@ -500,7 +499,6 @@ def form_valid(self, form):
             form.instance.house_images.create(house=house_data, image=image)
         return super().form_valid(form)
 
-
     def get_success_url(self):
         return reverse("core:house_detail", kwargs={"slug": self.object.slug})
 

realtoric/templates/pages/home.html

@@ -30,18 +30,11 @@ <h1 class="heading" data-aos="fade-up">
             <form
               action="{% url 'core:search_results' %}"
               method="GET"
-              class="narrow-w form-search d-flex align-items-stretch mb-3"
+              class="narrow-w form-search d-flex align-items-stretch justify-content-center mb-3"
               data-aos="fade-up"
               data-aos-delay="200"
             >
               {{ form|crispy }}
-              <input
-                required
-                type="text"
-                name="search"
-                class="form-control px-4"
-                placeholder="Choose city and search..."
-              />
               <button type="submit" class="btn btn-primary">Search</button>
             </form>
           </div>

realtoric/templates/pages/search_results.html

@@ -12,19 +12,11 @@
           <form
             action="{% url 'core:search_results' %}"
             method="GET"
-            class="narrow-w form-search d-flex align-items-stretch"
+            class="narrow-w form-search d-flex align-items-stretch justify-content-center"
             data-aos="fade-up"
             data-aos-delay="200"
           >
             {{ form|crispy }}
-            <input
-              required
-              type="text"
-              name="search"
-              class="form-control px-4"
-              value="{{ request.GET.search }}"
-              placeholder="Choose city and search..."
-            />
             <button type="submit" class="btn btn-primary">Search</button>
           </form>
         </div>
@@ -36,7 +28,7 @@
         <div class="row align-items-center">
           <div class="col-lg-6">
             <h2 class="font-weight-bold text-primary heading">
-              Search results for "{{ request.GET.search }}":
+              Search results for "{{ request.GET.category }} in {{ request.GET.city }}":
             </h2>
           </div>
         </div>
@@ -189,7 +181,7 @@ <h6 class="card-text">{{ property.description|capfirst|truncatewords:6 }}</h6>
           <div class="col">
             <div class="alert alert-danger d-flex align-items-center" role="alert">
                 <h4>
-                  No results found for "{{ request.GET.search }}"!
+                  No results found!
                 </h4>
             </div>
           </div>