Use queryset in JSON endpoint.

coin/offers/views.py

@@ -40,15 +40,10 @@ def subscription_count_json(request):
         except ValueError, TypeError:
             return HttpResponseServerError("Incorrect date format, should be YYYY-MM-DD")
 
-    # Count offer subscription
-    offers = Offer.objects\
-                  .filter(Q(offersubscription__subscription_date__lte=date) & (Q(offersubscription__resign_date__gt=date) | Q(offersubscription__resign_date__isnull=True)))\
-                  .annotate(num_subscriptions=Count('offersubscription'))\
-                  .order_by('name')
-
-    # Print count by offer type
-    for offer in offers:
-        output[offer.name] = offer.num_subscriptions
-
-    return JsonResponse(output)
+    # Get current offer subscription
+    offersubscriptions = OfferSubscription.objects.running(date).offer_summary()
+    for offersub in offersubscriptions:
+        output[offersub['offer__name']] = offersub['num_subscriptions']
 
+    # Return JSON
+    return JsonResponse(output)