Implemented post-filtering with 2 parameters: km range and upcoming events

Author: maggiofrancesco

pugliaeventi/views.py

@@ -27,9 +27,16 @@ def index(request):
             if search_rec_form.is_valid():
                 mood = search_rec_form.cleaned_data.get('mood')
                 companionship = search_rec_form.cleaned_data.get('companionship')
+                distance = search_rec_form.cleaned_data.get('km_range')
+                any_events = search_rec_form.cleaned_data.get('any_events')
                 lightfm_user_id = constant.DJANGO_USER_ID_BASE_START_LIGHTFM + request.user.id
                 contextual_lightfm_user_id = str(lightfm_user_id) + str(mood) + str(companionship)
-                recommended_places = lightfm_manager.find_recommendations(contextual_lightfm_user_id)
+
+                recommended_places = lightfm_manager.find_recommendations(
+                    contextual_lightfm_user_id,
+                    request.user.profile.location,
+                    int(distance),
+                    any_events)
 
             context = {
                 'search_form': search_rec_form,

recommender_webapp/common/constant.py

@@ -15,4 +15,6 @@
 RATINGS_PER_CONTEXT_CONF = 5
 CONTEXTS = 6
 DJANGO_USER_ID_BASE_START_LIGHTFM = 100
-NUM_RECOMMENDATIONS = 30
+NUM_RECOMMENDATIONS_TO_SHOW = 30
+NUM_RECOMMENDATIONS_FROM_LIGHTFM = 300
+

recommender_webapp/common/lightfm_manager.py

@@ -1,8 +1,9 @@
 import csv
+from datetime import datetime
 
 from recommender_webapp.common import constant
 from engine import lightfm_pugliaeventi
-from recommender_webapp.models import Place
+from recommender_webapp.models import Place, Distanza, Event
 
 
 def add_user(user_id, user_location,  user_contexts, data):
@@ -49,15 +50,38 @@ def add_rating(contextual_lightfm_user_id, place_id, rating):
     lightfm_pugliaeventi.add_rating_to_model(max_user_id, max_item_id, contextual_lightfm_user_id, place_id, rating)
 
 
-def find_recommendations(user):
+def find_recommendations(user, user_location, distance, any_events):
     recommended_places = []
     user = int(user) - 1   # LightFM uses a zero-based indexing
     model, data = lightfm_pugliaeventi.learn_model()
-    recommendations = lightfm_pugliaeventi.find_recommendations(user, model, data)
-    places_to_show = recommendations[:constant.NUM_RECOMMENDATIONS]
-    for place in places_to_show:
-        place_id = place + 1  # Because the LightFM zero-based indexing
-        place = Place.objects.get(placeId=place_id)
-        recommended_places.append(place)
+    recommendations = lightfm_pugliaeventi.find_recommendations(user, model, data)[:constant.NUM_RECOMMENDATIONS_FROM_LIGHTFM]
+    recommendation_objects = []
+    for index in recommendations:
+        place_id = index + 1  # Because the LightFM zero-based indexing
+        if Place.objects.filter(placeId=place_id).exists():
+            place = Place.objects.get(placeId=place_id)
+            recommendation_objects.append(place)
+
+    if any_events:
+        recommendations_with_events = []
+        for place in recommendation_objects:
+            if Event.objects.filter(place=place, date_from__gte=datetime.today().date()).exists():
+                recommendations_with_events.append(place)
+        recommendation_objects = recommendations_with_events
+
+    if distance:
+        locations_in_range = [distance[0] for distance in
+                              Distanza.objects.filter(cittaA=user_location,
+                                                      distanza__lte=distance).order_by('distanza').values_list('cittaB')]
+        locations_in_range = [user_location] + locations_in_range
+        for place in recommendation_objects:
+            if place.location in locations_in_range:
+                recommended_places.append(place)
+            if len(recommended_places) == constant.NUM_RECOMMENDATIONS_TO_SHOW:
+                break
+    else:
+        places_to_show = recommendation_objects[:constant.NUM_RECOMMENDATIONS_TO_SHOW]
+        for place in places_to_show:
+            recommended_places.append(place)
 
     return recommended_places

recommender_webapp/forms.py

@@ -55,7 +55,15 @@ def clean(self, *args, **kwargs):
         return super(UserRegisterForm, self).clean(*args, **kwargs)
 
 
-# This form is used for searching recommendations and also for adding a new rating
+class SearchRecommendationDistanceRange(ChoiceEnum):
+    __order__ = 'unlimited km20 km40 km60'
+    unlimited = 0
+    km20 = 20
+    km40 = 40
+    km60 = 60
+
+
+# This form is used for searching recommendations
 class SearchRecommendationForm(forms.Form):
     mood = forms.ChoiceField(
         required=True,
@@ -67,9 +75,30 @@ class SearchRecommendationForm(forms.Form):
         widget=forms.Select,
         choices=[choice[::-1] for choice in Companionship.choices()]
     )
+    km_range = forms.ChoiceField(
+        required=False,
+        widget=forms.Select,
+        choices=[choice[::-1] for choice in SearchRecommendationDistanceRange.choices()],
+        label='Distance'
+    )
+    any_events = forms.BooleanField(initial=False, required=False, label='Any events')
+
+
+# This form is used for adding a new rating
+class AddRatingForm(forms.Form):
+    mood = forms.ChoiceField(
+        required=True,
+        widget=forms.Select,
+        choices=[choice[::-1] for choice in Mood.choices()]
+    )
+    companionship = forms.ChoiceField(
+        required=True,
+        widget=forms.Select,
+        choices=[choice[::-1] for choice in Companionship.choices()]
+    )
 
 
-class DistanceRange(ChoiceEnum):
+class SearchPlacesDistanceRange(ChoiceEnum):
     __order__ = 'km5 km10'
     km5 = 5
     km10 = 10
@@ -82,7 +111,7 @@ class SearchNearPlacesForm(forms.Form):
     km_range = forms.ChoiceField(
         required=True,
         widget=forms.Select,
-        choices=[choice[::-1] for choice in DistanceRange.choices()]
+        choices=[choice[::-1] for choice in SearchPlacesDistanceRange.choices()]
     )
 
 

recommender_webapp/views.py

@@ -8,8 +8,8 @@
 from django.views.decorators.csrf import csrf_protect
 
 from recommender_webapp.common import lightfm_manager, constant
-from recommender_webapp.forms import ProfileForm, UserRegisterForm, SearchNearPlacesForm, DistanceRange, \
-    SearchRecommendationForm, FullProfileForm
+from recommender_webapp.forms import ProfileForm, UserRegisterForm, SearchNearPlacesForm, SearchPlacesDistanceRange, \
+    AddRatingForm, FullProfileForm
 from recommender_webapp.models import Comune, Distanza, Place, Mood, Companionship, Rating, User, Profile, Event
 
 
@@ -115,26 +115,18 @@ def profile_configuration(request):
 
             close_places = []
             user_location = request.user.profile.location
-            distances_in_range = Distanza.objects.filter(cittaA=user_location, distanza__lte=constant.KM_RANGE_CONFIGURATION).order_by('distanza')
-
-            user_location_places = Place.objects.filter(location=user_location)
-            for place in user_location_places:
-                place_dict = vars(place)
-                place_dict['labels'] = place.labels()
-                rated_place = Rating.objects.filter(place=place, user=request.user.profile)
-                if rated_place:
-                    place_dict['rated'] = True
-                    rated_places.append(place_dict)
-                else:
-                    close_places.append(place_dict)
-
-            for distance in distances_in_range:
-                places = Place.objects.filter(location=distance.cittaB)
+            locations_in_range = [distance[0] for distance in
+                                  Distanza.objects.filter(
+                                      cittaA=user_location,
+                                      distanza__lte=constant.KM_RANGE_CONFIGURATION).order_by('distanza').values_list('cittaB')]
+            locations_in_range = [user_location] + locations_in_range
+
+            for location in locations_in_range:
+                places = Place.objects.filter(location=location)
                 for place in places:
                     place_dict = vars(place)
                     place_dict['labels'] = place.labels()
-                    rated_place = Rating.objects.filter(place=place)
-                    if rated_place:
+                    if Rating.objects.filter(place=place, user=request.user.profile).exists():
                         place_dict['rated'] = True
                         rated_places.append(place_dict)
                     else:
@@ -175,42 +167,31 @@ def add_rating_config(request, place_id, mood, companionship):
 
 def close_places(request):
     context = {}
-    rated_places = []
     close_places = []
 
     if request.user.is_authenticated:
 
         search_near_places_form = SearchNearPlacesForm(request.POST or None)
-        initial_km_range = (DistanceRange.km5.name, DistanceRange.km5.value)
+        initial_km_range = (SearchPlacesDistanceRange.km5.name, SearchPlacesDistanceRange.km5.value)
         search_near_places_form.fields['km_range'].initial = initial_km_range
 
         if search_near_places_form.is_valid():
             km_range = search_near_places_form.cleaned_data.get('km_range')
             user_location = request.user.profile.location
-            distances_in_range = Distanza.objects.filter(cittaA=user_location, distanza__lte=km_range).order_by('distanza')
-
-            user_location_places = Place.objects.filter(location=user_location)
-            for place in user_location_places:
-                place_dict = vars(place)
-                place_dict['labels'] = place.labels()
-                rated_place = Rating.objects.filter(place=place, user=request.user.profile)
-                if rated_place:
-                    place_dict['rated'] = True
-                    rated_places.append(place_dict)
-                else:
-                    close_places.append(place_dict)
-
-            for distance in distances_in_range:
-                places = Place.objects.filter(location=distance.cittaB)
+            locations_in_range = [distance[0] for distance in
+                                  Distanza.objects.filter(
+                                      cittaA=user_location,
+                                      distanza__lte=km_range).order_by('distanza').values_list('cittaB')]
+            locations_in_range = [user_location] + locations_in_range
+
+            for distance in locations_in_range:
+                places = Place.objects.filter(location=distance)
                 for place in places:
                     place_dict = vars(place)
                     place_dict['labels'] = place.labels()
-                    rated_place = Rating.objects.filter(place=place)
-                    if rated_place:
+                    if Rating.objects.filter(place=place).exists():
                         place_dict['rated'] = True
-                        rated_places.append(place_dict)
-                    else:
-                        close_places.append(place_dict)
+                    close_places.append(place_dict)
 
         context = {
             'search_form': search_near_places_form,
@@ -253,7 +234,7 @@ def place_details(request, place_id):
     context = {}
     if request.user.is_authenticated:
 
-        search_rec_form = SearchRecommendationForm(request.POST or None)
+        search_rec_form = AddRatingForm(request.POST or None)
         initial_mood = (Mood.joyful.name, Mood.joyful.value)
         search_rec_form.fields['mood'].initial = initial_mood
 

templates/index.html

@@ -26,6 +26,12 @@ <h5 class="text-center">Search recommendations right for you</h5>
                     <div class="col-auto my-1">
                       {{ search_form.companionship|as_crispy_field }}
                     </div>
+                    <div class="col-auto my-1">
+                      {{ search_form.km_range|as_crispy_field }}
+                    </div>
+                    <div class="col-auto my-1">
+                      {{ search_form.any_events|as_crispy_field }}
+                    </div>
                     <div class="col-auto my-1">
                       <button type="submit" class="btn btn-primary" onclick="modal();">Search</button>
                     </div>