Merge pull request #7 from psf/finish_migration_to_pull_number

Finish migration from ref -> pull_number for tracking PendingSignatures

Author: ewdurbin

cla/admin.py

@@ -76,12 +76,11 @@ def has_delete_permission(self, request, obj=None):
 
 
 class PendingSignatureAdmin(admin.ModelAdmin):
-    list_display = ["email_address", "agreement", "get_repository_display"]
+    list_display = ["email_address", "agreement", "get_pr_display"]
     readonly_fields = [
         "agreement",
-        "get_repository_display",
+        "get_pr_display",
         "github_repository_id",
-        "ref",
         "pull_number",
         "email_address",
         "normalized_email",
@@ -91,9 +90,10 @@ class PendingSignatureAdmin(admin.ModelAdmin):
     def normalized_email(self, obj):
         return obj.normalized_email
 
-    def get_repository_display(self, obj=None):
+    def get_pr_display(self, obj=None):
         if obj:
-            return Repository.objects.get(repository_id=obj.github_repository_id)
+            repository = Repository.objects.get(repository_id=obj.github_repository_id)
+            return f"{repository.full_name} #{obj.pull_number}"
         return None
 
 

cla/migrations/0005_remove_pendingsignature_ref.py

@@ -0,0 +1,17 @@
+# Generated by Django 5.2 on 2025-04-18 12:07
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("cla", "0004_pendingsignature_pull_number"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="pendingsignature",
+            name="ref",
+        ),
+    ]

cla/migrations/0006_alter_pendingsignature_pull_number.py

@@ -0,0 +1,19 @@
+# Generated by Django 5.2 on 2025-04-18 12:08
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("cla", "0005_remove_pendingsignature_ref"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="pendingsignature",
+            name="pull_number",
+            field=models.IntegerField(default=-1),
+            preserve_default=False,
+        ),
+    ]

cla/models.py

@@ -109,8 +109,7 @@ class PendingSignature(models.Model):
 
     agreement = models.ForeignKey(Agreement, on_delete=models.PROTECT)
     github_repository_id = models.IntegerField()
-    ref = models.CharField(max_length=512)
-    pull_number = models.IntegerField(null=True)
+    pull_number = models.IntegerField()
     email_address = models.EmailField(max_length=512)
     objects = PendingSignatureManager()
 

cla/tasks.py

@@ -143,8 +143,7 @@ async def check_pull_request(
                     agreement=agreement,
                     github_repository_id=target_repository_id,
                     email_address=author.email,
-                    ref=pull_request_head_sha,
-                    defaults={"pull_number": pull_request_number},
+                    pull_number=pull_request_number,
                 )
                 needs_signing.add(author)
             elif signature.github_id is None or signature.github_node_id is None: