Add top CorporateMembers to docs sidebar

This was requested by the fundraising working group.

I abstracted the top `CorporateMember` display from the `releases` app
sidebar into a new inclusion tag called `top_corporate_members` and
included it in its original place as well as in the `docs` sidebar as
requested.

Uploaded images for `CorporateMember`s may not display in local
development environments do to the way media files paths work with
subdomains.

Author: adamzap

djangoproject/templates/fundraising/includes/top_corporate_members.html

@@ -0,0 +1,22 @@
+{% if members %}
+  <div class="corporate-members">
+    <h3>Diamond and Platinum Members</h3>
+    {% for obj in members %}
+      <div class="clearfix">
+        <div class="member-logo">
+          <a href="{{ obj.url }}" title="{{ obj.display_name }}">
+            <img src="{{ obj.thumbnail.url }}" alt="{{ obj.display_name }}" />
+          </a>
+        </div>
+        <div class="small-cta">
+          <ul class="list-links-small">
+            <li><strong>{{ obj.display_name }}</strong></li>
+            <li><a href="{{ obj.url }}" title="{{ obj.display_name }}">
+              {{ obj.description }}
+            </a></li>
+          </ul>
+        </div>
+      </div>
+    {% endfor %}
+  </div>
+{% endif %}

djangoproject/templates/releases/download.html

@@ -273,28 +273,7 @@ <h2 id="unsupported-versions">Unsupported previous releases</h2>
   <div role="complementary">
     <h2 class="visuallyhidden" id="aside-header">Additional Information</h2>
 
-    {% if corporate_members %}
-      <div class="corporate-members">
-        <h3>Diamond and Platinum Members</h3>
-        {% for obj in corporate_members %}
-          <div class="clearfix">
-            <div class="member-logo">
-              <a href="{{ obj.url }}" title="{{ obj.display_name }}">
-                <img src="{{ obj.thumbnail.url }}" alt="{{ obj.display_name }}" />
-              </a>
-            </div>
-            <div class="small-cta">
-              <ul class="list-links-small">
-                <li><strong>{{ obj.display_name }}</strong></li>
-                <li><a href="{{ obj.url }}" title="{{ obj.display_name }}">
-                  {{ obj.description }}
-                </a></li>
-              </ul>
-            </div>
-          </div>
-        {% endfor %}
-      </div>
-    {% endif %}
+    {% top_corporate_members %}
 
     {% donation_snippet %}
 

docs/templates/docs/doc.html

@@ -222,5 +222,7 @@ <h3 id="links-wrapper-header">{% trans "Download:" %}</h3>
         </p>
       </section>
     {% endblock links-wrapper %}
+
+    {% top_corporate_members %}
   </div>
 {% endblock content-related %}

fundraising/templatetags/fundraising_extras.py

@@ -111,3 +111,10 @@ def display_django_heroes():
         "display_logo_amount": int(LEADERSHIP_LEVEL_AMOUNT),
         "corporate_membership_amounts": CORPORATE_MEMBERSHIP_AMOUNTS,
     }
+
+
+@register.inclusion_tag("fundraising/includes/top_corporate_members.html")
+def top_corporate_members():
+    members = CorporateMember.objects.by_membership_level()
+
+    return {"members": members["diamond"] + members["platinum"]}

fundraising/tests/test_templatetags.py

@@ -1,4 +1,4 @@
-from datetime import datetime, timedelta
+from datetime import date, datetime, timedelta
 from decimal import Decimal
 
 from django.test import TestCase
@@ -17,6 +17,7 @@
 from ..templatetags.fundraising_extras import (
     display_django_heroes,
     donation_form_with_heart,
+    top_corporate_members,
 )
 
 
@@ -93,3 +94,76 @@ def create_hero_with_payment_date(days):
 
         response = display_django_heroes()
         self.assertEqual(response["heroes"], [hero2, hero3])
+
+
+class TestTopCorporateMembers(TestCase):
+    past_date = date(2000, 1, 1)
+    future_date = date(3000, 1, 1)
+
+    @classmethod
+    def setUpTestData(cls):
+        member_1 = CorporateMember.objects.create(membership_level=1)
+        member_2 = CorporateMember.objects.create(membership_level=2)
+        member_3 = CorporateMember.objects.create(membership_level=3)
+        member_4 = CorporateMember.objects.create(membership_level=4)
+        member_5 = CorporateMember.objects.create(membership_level=5)
+
+        member_1.invoice_set.create(amount=5, expiration_date=cls.future_date)
+        member_2.invoice_set.create(amount=5, expiration_date=cls.future_date)
+        member_3.invoice_set.create(amount=5, expiration_date=cls.future_date)
+        member_4.invoice_set.create(amount=5, expiration_date=cls.past_date)
+        member_5.invoice_set.create(amount=5, expiration_date=cls.past_date)
+
+    def test_with_no_platinum_or_diamond_members(self):
+        members = top_corporate_members()["members"]
+
+        self.assertEqual(members, [])
+
+    def test_with_diamond_members_and_no_platinum_members(self):
+        member_1 = CorporateMember.objects.create(membership_level=5)
+        member_2 = CorporateMember.objects.create(membership_level=5)
+        member_3 = CorporateMember.objects.create(membership_level=5)
+
+        member_1.invoice_set.create(amount=4, expiration_date=self.future_date)
+        member_2.invoice_set.create(amount=8, expiration_date=self.future_date)
+        member_3.invoice_set.create(amount=2, expiration_date=self.future_date)
+
+        members = top_corporate_members()["members"]
+
+        self.assertEqual(members, [member_2, member_1, member_3])
+
+    def test_with_platinum_members_and_no_diamond_members(self):
+        member_1 = CorporateMember.objects.create(membership_level=4)
+        member_2 = CorporateMember.objects.create(membership_level=4)
+        member_3 = CorporateMember.objects.create(membership_level=4)
+
+        member_1.invoice_set.create(amount=4, expiration_date=self.future_date)
+        member_2.invoice_set.create(amount=8, expiration_date=self.future_date)
+        member_3.invoice_set.create(amount=2, expiration_date=self.future_date)
+
+        members = top_corporate_members()["members"]
+
+        self.assertEqual(members, [member_2, member_1, member_3])
+
+    def test_with_diamond_members_and_platinum_members(self):
+        member_1 = CorporateMember.objects.create(membership_level=4)
+        member_2 = CorporateMember.objects.create(membership_level=4)
+        member_3 = CorporateMember.objects.create(membership_level=4)
+
+        member_4 = CorporateMember.objects.create(membership_level=5)
+        member_5 = CorporateMember.objects.create(membership_level=5)
+        member_6 = CorporateMember.objects.create(membership_level=5)
+
+        member_1.invoice_set.create(amount=4, expiration_date=self.future_date)
+        member_2.invoice_set.create(amount=8, expiration_date=self.future_date)
+        member_3.invoice_set.create(amount=2, expiration_date=self.future_date)
+
+        member_4.invoice_set.create(amount=4, expiration_date=self.future_date)
+        member_5.invoice_set.create(amount=8, expiration_date=self.future_date)
+        member_6.invoice_set.create(amount=2, expiration_date=self.future_date)
+
+        members = top_corporate_members()["members"]
+
+        expected = [member_5, member_4, member_6, member_2, member_1, member_3]
+
+        self.assertEqual(members, expected)

releases/views.py

@@ -1,8 +1,6 @@
 from django.http import Http404, HttpResponsePermanentRedirect
 from django.shortcuts import get_object_or_404, render
 
-from members.models import CorporateMember
-
 from .models import Release
 
 
@@ -23,17 +21,12 @@ def index(request):
     # Get the list of earlier releases.
     unsupported = Release.objects.unsupported()
 
-    corporate_members = CorporateMember.objects.by_membership_level()
-
     context = {
         "current": current,
         "previous": previous,
         "lts": lts,
         "unsupported": unsupported,
         "preview": preview,
-        "corporate_members": (
-            corporate_members["diamond"] + corporate_members["platinum"]
-        ),
     }
     return render(request, "releases/download.html", context)