Update membership types: merge Managing into Contributing

dorian-adams · dorian-adams · commit f65ca853fb94 · 2025-01-22T02:23:12.000-05:00
Update `membership_type` on `Membership` model to reflect 2024 Bylaws Change 1 (psf/bylaws#4) - Create data migration to merge `MANAGING` (3) into `CONTRIBUTING` (4). - Update `Membership` model, remove `MANAGING`. - Update all references: `MANAGING` to `CONTRIBUTING`. Left gap in `membership_type` choice values to ease data migration process. Closes #2566
diff --git a/users/actions.py b/users/actions.py
@@ -5,7 +5,7 @@
 
 def export_csv(modeladmin, request, queryset):
     membership_name = {
-        0: 'Basic', 1: 'Supporting', 2: 'Sponsor', 3: 'Managing',
+        0: 'Basic', 1: 'Supporting', 2: 'Sponsor',
         4: 'Contributing', 5: 'Fellow'
     }
     response = HttpResponse(content_type='text/csv')
diff --git a/users/migrations/0016_auto_20250121_2256.py b/users/migrations/0016_auto_20250121_2256.py
@@ -0,0 +1,24 @@
+# Generated by Django 4.2.17 on 2025-01-21 22:56
+
+# Data migration: Merge MANAGING (3) membership_type into CONTRIBUTING (4)
+
+from django.db import migrations
+
+
+def update_membership_level(apps, schema_editor):
+    Membership = apps.get_model('users', 'Membership')
+    Membership.objects.filter(membership_type=3).update(membership_type=4)
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('users', '0015_alter_user_first_name'),
+    ]
+
+    operations = [
+        migrations.RunPython(
+            update_membership_level,
+            migrations.RunPython.noop
+        )
+    ]
diff --git a/users/migrations/0017_alter_membership_membership_type.py b/users/migrations/0017_alter_membership_membership_type.py
@@ -0,0 +1,18 @@
+# Generated by Django 4.2.17 on 2025-01-22 03:20
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('users', '0016_auto_20250121_2256'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='membership',
+            name='membership_type',
+            field=models.IntegerField(choices=[(0, 'Basic Member'), (1, 'Supporting Member'), (2, 'Sponsor Member'), (4, 'Contributing Member'), (5, 'Fellow')], default=0),
+        ),
+    ]
diff --git a/users/models.py b/users/models.py
@@ -77,15 +77,13 @@ class Membership(models.Model):
     BASIC = 0
     SUPPORTING = 1
     SPONSOR = 2
-    MANAGING = 3
     CONTRIBUTING = 4
     FELLOW = 5
 
     MEMBERSHIP_CHOICES = (
         (BASIC, 'Basic Member'),
         (SUPPORTING, 'Supporting Member'),
         (SPONSOR, 'Sponsor Member'),
-        (MANAGING, 'Managing Member'),
         (CONTRIBUTING, 'Contributing Member'),
         (FELLOW, 'Fellow'),
     )
diff --git a/users/tests/test_models.py b/users/tests/test_models.py
@@ -34,7 +34,7 @@ def test_membership(self):
 
     def test_higher_level_member(self):
         member1 = MembershipFactory()
-        member2 = MembershipFactory(membership_type=Membership.SPONSOR)
+        member2 = MembershipFactory(membership_type=Membership.CONTRIBUTING)
 
         self.assertFalse(member1.higher_level_member)
         self.assertTrue(member2.higher_level_member)

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`
`6`	`6`	`def export_csv(modeladmin, request, queryset):`
`7`	`7`	`membership_name = {`
`8`		`- 0: 'Basic', 1: 'Supporting', 2: 'Sponsor', 3: 'Managing',`
	`8`	`+ 0: 'Basic', 1: 'Supporting', 2: 'Sponsor',`
`9`	`9`	`4: 'Contributing', 5: 'Fellow'`
`10`	`10`	`}`
`11`	`11`	`response = HttpResponse(content_type='text/csv')`