feat: Add gold members on pages foundation and community

Author: antoinehashbang

aggregator/tests.py

@@ -92,7 +92,7 @@ def setUp(self, mocker):
     def test_community_index_number_of_queries(self):
         """Intended to prevent an n+1 issue on the community index view"""
         url = reverse("community-index")
-        with self.assertNumQueries(6):
+        with self.assertNumQueries(7):
             self.client.get(url)
 
     def test_empty_feed_type_not_rendered(self):

djangoproject/templates/aggregator/index.html

@@ -1,5 +1,5 @@
 {% extends "base_community.html" %}
-{% load i18n %}
+{% load fundraising_extras i18n %}
 
 {% block layout_class %}column-container sidebar-right{% endblock %}
 
@@ -97,3 +97,7 @@ <h2 class="bullet-icon"><i class="icon icon-rss blue"></i> {{ feedtype.name }}</
     {% endfor %}
   </ul>
 {% endblock %}
+
+{% block content-related-extra %}
+  {% gold_corporate_members %}
+{% endblock %}

djangoproject/templates/base_community.html

@@ -23,6 +23,9 @@
 {% block content-related %}
   <div role="complementary">
     <h2 class="visuallyhidden" id="aside-header">{% translate "Additional Information" %}</h2>
+
+    {% block content-related-extra %}{% endblock %}
+
     {% donation_snippet %}
 
     <h3>{% translate "More Help" %}</h3>

djangoproject/templates/base_foundation.html

@@ -15,6 +15,9 @@
 {# Always include <h2> label and <div> with aria role. #}
   <div role="complementary">
     <h2 class="visuallyhidden" id="aside-header">{% translate "Additional Information" %}</h2>
+
+    {% block content-related-extra %}{% endblock %}
+
     {% donation_snippet %}
 
     <h3>About the foundation</h3>

djangoproject/templates/flatpages/foundation.html

@@ -1,5 +1,5 @@
 {% extends "base_foundation.html" %}
-
+{% load fundraising_extras %}
 {% block og_title %}{{ flatpage.title }}{% endblock %}
 
 {% block title %}{{ flatpage.title }}{% endblock %}
@@ -8,3 +8,7 @@
     <h1>{{ flatpage.title }}</h1>
     {{ flatpage.content }}
 {% endblock %}
+
+{% block content-related-extra %}
+    {% gold_corporate_members %}
+{% endblock %}

djangoproject/templates/fundraising/includes/gold_corporate_members.html

@@ -0,0 +1,22 @@
+{% if members %}
+  <div class="corporate-members">
+    <h3>Gold 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 %}

fundraising/templatetags/fundraising_extras.py

@@ -118,3 +118,10 @@ def top_corporate_members():
     members = CorporateMember.objects.by_membership_level()
 
     return {"members": members["diamond"] + members["platinum"]}
+
+
+@register.inclusion_tag("fundraising/includes/gold_corporate_members.html")
+def gold_corporate_members():
+    members = CorporateMember.objects.by_membership_level()
+
+    return {"members": members["gold"]}

fundraising/tests/test_templatetags.py

@@ -17,6 +17,7 @@
 from ..templatetags.fundraising_extras import (
     display_django_heroes,
     donation_form_with_heart,
+    gold_corporate_members,
     top_corporate_members,
 )
 
@@ -167,3 +168,51 @@ def test_with_diamond_members_and_platinum_members(self):
         expected = [member_5, member_4, member_6, member_2, member_1, member_3]
 
         self.assertEqual(members, expected)
+
+
+class TestGoldCorporateMembers(TestCase):
+    past_date = date(2000, 1, 1)
+    future_date = date(3000, 1, 1)
+
+    def test_with_no_gold_members(self):
+        members = gold_corporate_members()["members"]
+        self.assertEqual(members, [])
+
+    def test_with_gold_members(self):
+        member_1 = CorporateMember.objects.create(membership_level=3)
+        member_2 = CorporateMember.objects.create(membership_level=3)
+        member_3 = CorporateMember.objects.create(membership_level=3)
+
+        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 = gold_corporate_members()["members"]
+
+        self.assertEqual(members, [member_2, member_1, member_3])
+
+    def test_with_gold_members_and_other_members(self):
+        member_1 = CorporateMember.objects.create(membership_level=3)
+        member_2 = CorporateMember.objects.create(membership_level=3)
+        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 = gold_corporate_members()["members"]
+        self.assertEqual(members, [member_2, member_1])
+        self.assertNotIn(member_3, members)
+
+    def test_with_gold_members_and_expired_invoice(self):
+        member_1 = CorporateMember.objects.create(membership_level=3)
+        member_2 = CorporateMember.objects.create(membership_level=3)
+        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.past_date)
+
+        members = gold_corporate_members()["members"]
+        self.assertEqual(members, [member_2, member_1])
+        self.assertNotIn(member_3, members)