Skip to content

Commit 2d9ec09

Browse files
JacobCoffeedorian-adamsjacob
authored
fix(membership): remove managing member type per 2024 bylaws change (#2916)
Closes #2566 Co-authored-by: Dorian Adams <dorian-adams@users.noreply.github.com> Co-authored-by: jacob <jacob@coffee.dev>
1 parent be7cd56 commit 2d9ec09

File tree

4 files changed

+47
-3
lines changed

4 files changed

+47
-3
lines changed

apps/users/actions.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
def export_csv(modeladmin, request, queryset):
99
"""Export selected memberships as a CSV file."""
10-
membership_name = {0: "Basic", 1: "Supporting", 2: "Sponsor", 3: "Managing", 4: "Contributing", 5: "Fellow"}
10+
membership_name = {0: "Basic", 1: "Supporting", 2: "Sponsor", 4: "Contributing", 5: "Fellow"}
1111
response = HttpResponse(content_type="text/csv")
1212
response["Content-Disposition"] = "attachment; filename=membership.csv"
1313
fieldnames = [
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# Data migration: Merge MANAGING (3) membership_type into CONTRIBUTING (4)
2+
# Per 2024 PSF Bylaws Change 1 (https://github.com/psf/bylaws/pull/4)
3+
4+
from django.db import migrations
5+
6+
7+
def merge_managing_into_contributing(apps, schema_editor):
8+
Membership = apps.get_model("users", "Membership")
9+
Membership.objects.filter(membership_type=3).update(membership_type=4)
10+
11+
12+
class Migration(migrations.Migration):
13+
dependencies = [
14+
("users", "0015_alter_user_first_name"),
15+
]
16+
17+
operations = [
18+
migrations.RunPython(
19+
merge_managing_into_contributing,
20+
migrations.RunPython.noop,
21+
),
22+
]
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
from django.db import migrations, models
2+
3+
4+
class Migration(migrations.Migration):
5+
dependencies = [
6+
("users", "0016_merge_managing_into_contributing"),
7+
]
8+
9+
operations = [
10+
migrations.AlterField(
11+
model_name="membership",
12+
name="membership_type",
13+
field=models.IntegerField(
14+
choices=[
15+
(0, "Basic Member"),
16+
(1, "Supporting Member"),
17+
(2, "Sponsor Member"),
18+
(4, "Contributing Member"),
19+
(5, "Fellow"),
20+
],
21+
default=0,
22+
),
23+
),
24+
]

apps/users/models.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,15 +91,13 @@ class Membership(models.Model):
9191
BASIC = 0
9292
SUPPORTING = 1
9393
SPONSOR = 2
94-
MANAGING = 3
9594
CONTRIBUTING = 4
9695
FELLOW = 5
9796

9897
MEMBERSHIP_CHOICES = (
9998
(BASIC, "Basic Member"),
10099
(SUPPORTING, "Supporting Member"),
101100
(SPONSOR, "Sponsor Member"),
102-
(MANAGING, "Managing Member"),
103101
(CONTRIBUTING, "Contributing Member"),
104102
(FELLOW, "Fellow"),
105103
)

0 commit comments

Comments
 (0)