Resolves #66, uses already existing 'created' fields to apply a 30-day window to visits and versions to get top lists for homepage; disabled selecting of system and incrementing of num visits in counter to save two (2) DB queries as information is redundant to SystemVisit

Author: pembo13

dbdb/core/models.py

@@ -204,7 +204,7 @@ def current(self):
         if self.id is None:
             return SystemVersion(system=self)
 
-        return self.systemversion_set.get(is_current=True)
+        return self.versions.get(is_current=True)
 
     def get_absolute_url(self):
         return reverse('system', args=[self.slug])
@@ -271,7 +271,7 @@ def __str__(self):
 # SystemVisit
 # ==============================================
 class SystemVisit(models.Model):
-    system = models.ForeignKey('System', models.CASCADE, related_name='counter')
+    system = models.ForeignKey('System', models.CASCADE, related_name='visits')
     ip_address = models.GenericIPAddressField(null=False)
     user_agent = models.CharField(max_length=128, blank=True, null=False)
     created = models.DateTimeField(default=timezone.now)
@@ -308,7 +308,7 @@ class Meta:
 class SystemVersion(models.Model):
 
     # Internal Version Meta-data
-    system = models.ForeignKey('System', models.CASCADE)
+    system = models.ForeignKey('System', models.CASCADE, related_name='versions')
     creator = models.ForeignKey(settings.AUTH_USER_MODEL, models.PROTECT)
     meta = models.ForeignKey('SystemVersionMetadata', models.SET_NULL, blank=True, null=True)
     ver = models.PositiveIntegerField('Version No.', default=1)

dbdb/core/views.py

@@ -37,6 +37,7 @@
 from haystack.query import SearchQuerySet
 from lxml import etree
 import jwt
+import pytz
 # project imports
 from dbdb.core.forms import CreateUserForm, SystemForm, SystemVersionForm, SystemVersionMetadataForm, SystemFeaturesForm, \
     SystemVersionEditForm
@@ -782,12 +783,12 @@ def post(self, request):
                     return JsonResponse({ 'status':'bot' })
 
                 ## Update the system's counter
-                system = None
-                with transaction.atomic():
-                    system = System.objects.select_for_update().get(pk=pk)
-                    system.view_count += 1
-                    system.save()
-                #pass
+                # system = None
+                # with transaction.atomic():
+                    # system = System.objects.select_for_update().get(pk=pk)
+                    # system.view_count += 1
+                    # system.save()
+                    # pass
 
                 # And add a SystemVisit entry
                 x_forwarded_for = request.META.get('HTTP_X_FORWARDED_FOR')
@@ -796,14 +797,18 @@ def post(self, request):
                 else:
                     ip = request.META.get('REMOTE_ADDR')
 
-                system_visit = SystemVisit(system=system, ip_address=ip, user_agent=user_agent[:127])
-                system_visit.save()
-
+                # save visit
+                system_visit = SystemVisit.objects.create(
+                    system_id=pk,
+                    ip_address=ip,
+                    user_agent=user_agent[:127]
+                )
+                pass
             else:
-                return JsonResponse({ 'status':('unrecognized counter: %r' % iss)}, status=400)
+                return JsonResponse({ 'status':('unrecognized counter: %r' % iss) }, status=400)
             pass
         except jwt.ExpiredSignatureError:
-            return JsonResponse({ 'status':'expired counter'}, status=400)
+            return JsonResponse({ 'status':'expired counter' }, status=400)
 
         return JsonResponse({ 'status':'ok' })
 
@@ -1063,7 +1068,7 @@ def post(self, request, slug=None):
                 logo = system.current().logo
                 pass
 
-            system.systemversion_set.update(is_current=False)
+            system.versions.update(is_current=False)
             db_version = system_version_form.save(commit=False)
             db_version.creator = request.user
             db_version.system = system
@@ -1198,7 +1203,7 @@ def post(self, request, slug):
 
         system = System.objects.get(slug=slug)
         version = SystemVersion.objects.get(id=request.POST['ver'])
-        system.systemversion_set.update(is_current=False)
+        system.versions.update(is_current=False)
         version.is_current = True
         system.ver = version.ver
         system.modified = timezone.now()
@@ -1279,25 +1284,45 @@ def get(self, request):
 # ==============================================
 class HomeView(View):
 
+    ITEMS_TO_SHOW = 5
+
     template_name = 'core/home.html'
 
     def get(self, request):
-        items_to_show = 5
-
+        # calculate date window
+        start_date = timezone.now().astimezone(pytz.utc) - datetime.timedelta(days=30) # rolling 30 days
+        start_date = datetime.datetime.combine(start_date.date(), datetime.time(0, 0, 0))
+        start_date = pytz.utc.localize(start_date)
+
+        # get top systems by modified date
+        most_recent = System.objects \
+            .order_by('-modified')
+        most_recent = most_recent[:HomeView.ITEMS_TO_SHOW]
+
+        # get top systems by number of (windowed) versions
+        most_versions = System.objects \
+            .annotate(num_versions=Count('versions__id', filter=Q(versions__created__gte=start_date))) \
+            .order_by('-num_versions', 'name') \
+            .filter(num_versions__gt=0)
+        most_versions = most_versions[:HomeView.ITEMS_TO_SHOW]
+
+        # get top systems by number of (windowed) visits
+        most_visits = System.objects \
+            .annotate(num_visits=Count('visits__id', filter=Q(visits__created__gte=start_date))) \
+            .order_by('-num_visits', 'name') \
+            .filter(num_visits__gt=0)
+        most_visits = most_visits[:HomeView.ITEMS_TO_SHOW]
+
+        # count numb systems
         num_systems = System.objects.all().count()
 
-
-        most_edited = System.objects.order_by('-ver', '-name')[:items_to_show]
-        most_recent = System.objects.order_by('-modified')[:items_to_show]
-        most_views = System.objects.order_by('-view_count')[:items_to_show]
-
-        return render(request, self.template_name, context={
-            'num_systems': num_systems,
-            'most_edited': most_edited,
+        return render(request, self.template_name, {
             'most_recent': most_recent,
-            'most_views': most_views,
+            'most_versions': most_versions,
+            'most_visits': most_visits,
 
             'no_nav_search': True,
+            'num_systems': num_systems,
         })
 
     pass

templates/core/home.html

@@ -1,4 +1,5 @@
 {% extends 'base.html' %}
+{% load humanize %}
 {% load staticfiles %}
 {% load thumbnail %}
 
@@ -10,7 +11,7 @@
     <div class="row justify-content-md-center homepage-header">
         <div class="col col-md-12 col-sm-12 text-center">
             <h1 class="display-3">Database of Databases</h1>
-            <p class="lead">Discover and learn about <b>{{ num_systems }}</b> database management systems</p>
+            <p class="lead">Discover and learn about <b>{{ num_systems|intcomma }}</b> database management systems</p>
             <form id="mainsearch" action="{% url 'browse' %}" method="GET" >
                 <div class="form-group">
                     <input autofocus type="text" name="q" class="form-control form-control-lg" aria-describedby="Search field" placeholder="Search" style="max-width:700px;margin:0 auto;">
@@ -40,7 +41,7 @@ <h3>Most Recent</h3>
             <h3>Most Viewed</h3>
             <table class="table table-hover">
                 <tbody>
-                {% for item in most_views %}
+                {% for item in most_visits %}
                     {% include 'core/home-listitem.html' %}
                 {% endfor %}
                 </tbody>
@@ -50,7 +51,7 @@ <h3>Most Viewed</h3>
             <h3>Most Edited</h3>
             <table class="table table-hover">
                 <tbody>
-                {% for item in most_edited %}
+                {% for item in most_versions %}
                     {% include 'core/home-listitem.html' %}
                 {% endfor %}
                 </tbody>