Merge pull request #23 from biojs/develop

Develop

Author: Megh-Thakkar

main/migrations/0010_auto_20180616_1659.py

@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.13 on 2018-06-16 16:59
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('main', '0009_auto_20180609_0855'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='contribution',
+            name='component',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='contributions', to='main.Component'),
+        ),
+    ]

main/models.py

@@ -66,5 +66,5 @@ def __unicode__(self):
 
 class Contribution(models.Model):
     contributor = models.ForeignKey(Contributor, on_delete=models.SET_NULL, null=True)
-    component = models.ForeignKey(Component, on_delete=models.SET_NULL, null=True)
+    component = models.ForeignKey(Component, on_delete=models.SET_NULL, null=True, related_name='contributions')
     contributions = models.IntegerField(default=0)

main/views.py

@@ -5,22 +5,23 @@
 from django.http import HttpResponse
 import urllib, json
 from django.core.management import call_command
+from django.core.serializers.json import DjangoJSONEncoder
 
 def index(request):
-    top_dl_components = Component.objects.all().order_by('-downloads')[:3]
-    top_starred_components = Component.objects.all().order_by('-stars')[:3]
-    recent_components = Component.objects.all().order_by('-modified_time')[:3]
-    dl = DownloadSerializer(top_dl_components, many=True)               # serialized data containing number of downloads
+    top_downloaded_components = Component.objects.all().only('name', 'id', 'downloads', 'url_name').order_by('-downloads')[:3]
+    top_starred_components = Component.objects.all().only('name', 'id', 'stars', 'url_name').order_by('-stars')[:3]
+    recent_components = Component.objects.all().only('name', 'id', 'modified_time', 'url_name').order_by('-modified_time')[:3]
+    downloaded = DownloadSerializer(top_downloaded_components, many=True)               # serialized data containing number of downloads
     starred = StarSerializer(top_starred_components, many=True)         # serialized data containing number of stars
-    recent = RecentComponentSerializer(recent_components, many=True)    # serialized data according to upload time
+    recent = RecentComponentSerializer(recent_components, many=True)
     return JsonResponse({
-        'top_dl_components':dl.data,
+        'top_dl_components':downloaded.data,
         'top_starred_components':starred.data,
         'most_recent_components':recent.data,
         })
 
 def all_components(request):    # requested on_load() for querying
-    all_components = BaseComponentSerializer(Component.objects.all(), many=True)
+    all_components = BaseComponentSerializer(Component.objects.all().only('name', 'id', 'url_name'), many=True)
     return JsonResponse({
         'all_components':all_components.data,
         })
@@ -35,7 +36,7 @@ def top_components(request):
 def component_details(request, url_name):
     component = Component.objects.get(url_name=url_name)
     details = DetailComponentSerializer(component, context={'request':request})
-    contributions = ContributionSerializer(Contribution.objects.filter(component=component), many=True)
+    contributions = ContributionSerializer(component.contributions, many=True)
     return JsonResponse({
         'details' : details.data,
         'contributors' : contributions.data,