Skip to content

feat: Add gold members on pages foundation and community #2305

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
antoinehashbang wants to merge 3 commits into
base: main
Choose a base branch
from
Open

feat: Add gold members on pages foundation and community #2305

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cd6cbb1
feat: Add gold members on pages foundation and community
antoinehashbang Oct 30, 2025
f16a8dd
fix: Show also diamond and platinium member in theses pages
antoinehashbang Nov 27, 2025
c403b6a
feat: Make top_corporate_members more generic
antoinehashbang Dec 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion aggregator/tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(7):
with self.assertNumQueries(8):
self.client.get(url)

def test_empty_feed_type_not_rendered(self):
Expand Down
6 changes: 5 additions & 1 deletion djangoproject/templates/aggregator/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% extends "base_community.html" %}
{% load i18n %}
{% load fundraising_extras i18n %}

{% block layout_class %}column-container sidebar-right{% endblock %}

Expand Down Expand Up @@ -97,3 +97,7 @@ <h2 class="bullet-icon"><i class="icon icon-rss blue"></i> {{ feedtype.name }}</
{% endfor %}
</ul>
{% endblock %}

{% block content-related-extra %}
{% top_corporate_members "diamond" "platinum" "gold" header="Diamond, Platinum and Gold Members" %}
{% endblock %}
3 changes: 3 additions & 0 deletions djangoproject/templates/base_community.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
3 changes: 3 additions & 0 deletions djangoproject/templates/base_foundation.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 5 additions & 1 deletion djangoproject/templates/flatpages/foundation.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% extends "base_foundation.html" %}

{% load fundraising_extras %}
{% block og_title %}{{ flatpage.title }}{% endblock %}

{% block title %}{{ flatpage.title }}{% endblock %}
Expand All @@ -8,3 +8,7 @@
<h1>{{ flatpage.title }}</h1>
{{ flatpage.content }}
{% endblock %}

{% block content-related-extra %}
{% top_corporate_members "diamond" "platinum" "gold" header="Diamond, Platinum and Gold Members" %}
{% endblock %}
2 changes: 1 addition & 1 deletion djangoproject/templates/fundraising/includes/top_corporate_members.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{% if members %}
<div class="corporate-members">
<h3>Diamond and Platinum Members</h3>
<h3>{{header}}</h3>
Copy link
Contributor

@sarahboyce sarahboyce Dec 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
<h3>{{header}}</h3>
<h3>{{ header }}</h3>

(nit)

{% for obj in members %}
<div class="clearfix">
<div class="member-logo">
Expand Down
2 changes: 1 addition & 1 deletion djangoproject/templates/releases/download.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ <h2 id="unsupported-versions">Unsupported previous releases</h2>
<div role="complementary">
<h2 class="visuallyhidden" id="aside-header">Additional Information</h2>

{% top_corporate_members %}
{% top_corporate_members "diamond" "platinum" header="Diamond and Platinum Members" %}

{% donation_snippet %}

Expand Down
2 changes: 1 addition & 1 deletion docs/templates/docs/doc.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,6 @@ <h3 id="links-wrapper-header">{% trans "Download:" %}</h3>
</section>
{% endblock links-wrapper %}

{% top_corporate_members %}
{% top_corporate_members "diamond" "platinum" header="Diamond and Platinum Members" %}
</div>
{% endblock content-related %}
15 changes: 12 additions & 3 deletions fundraising/templatetags/fundraising_extras.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,16 @@ def display_django_heroes():


@register.inclusion_tag("fundraising/includes/top_corporate_members.html")
def top_corporate_members():
members = CorporateMember.objects.by_membership_level()
def top_corporate_members(*levels, header=None):
"""
Usage:
{% top_corporate_members "diamond" "platinum" header="Diamond and Platinum Members" %}
"""

return {"members": members["diamond"] + members["platinum"]}
all_members: dict = CorporateMember.objects.by_membership_level()

members = []
for level in levels:
members.extend(all_members.get(level, []))

return {"header": header, "members": members}
58 changes: 53 additions & 5 deletions fundraising/tests/test_templatetags.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,12 +110,14 @@ def setUpTestData(cls):

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_3.invoice_set.create(amount=5, expiration_date=cls.past_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"]
members = top_corporate_members(
"diamond", "platinum", header="Diamond and Platinum members"
)["members"]

self.assertEqual(members, [])

Expand All @@ -128,7 +130,9 @@ def test_with_diamond_members_and_no_platinum_members(self):
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"]
members = top_corporate_members(
"diamond", "platinum", header="Diamond and Platinum members"
)["members"]
Comment on lines +133 to +135
Copy link
Contributor

@sarahboyce sarahboyce Dec 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
members = top_corporate_members(
"diamond", "platinum", header="Diamond and Platinum members"
)["members"]
members = top_corporate_members("diamond", "platinum")["members"]

The header doesn't matter here


self.assertEqual(members, [member_2, member_1, member_3])

Expand All @@ -141,7 +145,9 @@ def test_with_platinum_members_and_no_diamond_members(self):
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"]
members = top_corporate_members(
"diamond", "platinum", header="Diamond and Platinum members"
)["members"]
Comment on lines +148 to +150
Copy link
Contributor

@sarahboyce sarahboyce Dec 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
members = top_corporate_members(
"diamond", "platinum", header="Diamond and Platinum members"
)["members"]
members = top_corporate_members("diamond", "platinum")["members"]


self.assertEqual(members, [member_2, member_1, member_3])

Expand All @@ -162,8 +168,50 @@ def test_with_diamond_members_and_platinum_members(self):
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"]
members = top_corporate_members(
"diamond", "platinum", header="Diamond and Platinum members"
)["members"]
Comment on lines +171 to +173
Copy link
Contributor

@sarahboyce sarahboyce Dec 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
members = top_corporate_members(
"diamond", "platinum", header="Diamond and Platinum members"
)["members"]
members = top_corporate_members("diamond", "platinum")["members"]


expected = [member_5, member_4, member_6, member_2, member_1, member_3]

self.assertEqual(members, expected)

def test_with_diamond_platinum_and_gold_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_7 = CorporateMember.objects.create(membership_level=3)
member_8 = 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)

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)

member_7.invoice_set.create(amount=8, expiration_date=self.future_date)
member_8.invoice_set.create(amount=2, expiration_date=self.future_date)

members = top_corporate_members(
"diamond", "platinum", "gold", header="Diamond, Platinum and Gold members"
)["members"]

expected = [
member_5,
member_4,
member_6,
member_2,
member_1,
member_3,
member_7,
member_8,
]
Comment on lines +180 to +215
Copy link
Contributor

@sarahboyce sarahboyce Dec 8, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
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_7 = CorporateMember.objects.create(membership_level=3)
member_8 = 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)
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)
member_7.invoice_set.create(amount=8, expiration_date=self.future_date)
member_8.invoice_set.create(amount=2, expiration_date=self.future_date)
members = top_corporate_members(
"diamond", "platinum", "gold", header="Diamond, Platinum and Gold members"
)["members"]
expected = [
member_5,
member_4,
member_6,
member_2,
member_1,
member_3,
member_7,
member_8,
]
membership_levels = (
[PLATINUM_MEMBERSHIP] * 3 + [DIAMOND_MEMBERSHIP] * 3 + [GOLD_MEMBERSHIP] * 2
)
objs = CorporateMember.objects.bulk_create(
[CorporateMember(membership_level=ml) for ml in membership_levels]
)
# Add future invoices of varying amounts to set the order of sponsors.
# Platinum members.
objs[0].invoice_set.create(amount=4, expiration_date=self.future_date)
objs[1].invoice_set.create(amount=8, expiration_date=self.future_date)
objs[2].invoice_set.create(amount=2, expiration_date=self.future_date)
# Diamond members.
objs[3].invoice_set.create(amount=4, expiration_date=self.future_date)
objs[4].invoice_set.create(amount=8, expiration_date=self.future_date)
objs[5].invoice_set.create(amount=2, expiration_date=self.future_date)
# Gold members.
objs[6].invoice_set.create(amount=8, expiration_date=self.future_date)
objs[7].invoice_set.create(amount=2, expiration_date=self.future_date)
members = top_corporate_members("diamond", "platinum", "gold")["members"]
expected = [
objs[4], # Diamond, future invoice 8.
objs[3], # Diamond, future invoice 4.
objs[5], # Diamond, future invoice 2.
objs[1], # Platinum, future invoice 8.
objs[0], # Platinum, future invoice 4.
objs[2], # Platinum, future invoice 2.
objs[6], # Gold, future invoice 8.
objs[7], # Gold, future invoice 2.
]

We can use a bulk create here
We can also use the constants to make it clearer what membership levels are being created, these will need to be imported

from members.models import (
    CorporateMember,
    GOLD_MEMBERSHIP,
    PLATINUM_MEMBERSHIP,
    DIAMOND_MEMBERSHIP,
)

Copy link
Contributor

@sarahboyce sarahboyce Dec 8, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have just seen that the current test is aligned to the format of existing tests, in which case, this suggestion makes less sense 🤔 maybe ignore it (except the update to members = top_corporate_members("diamond", "platinum", "gold")["members"])
We might want to refactor the tests in future


self.assertEqual(members, expected)