Change from revision

tests/webapp/api/test_performance_alertsummary_api.py

@@ -93,6 +93,7 @@ def test_alert_summaries_get(
         "revision",
         "push_timestamp",
         "prev_push_revision",
+        "original_prev_push_revision",
         "performance_tags",
     }
     assert len(resp.json()["results"][0]["alerts"]) == 1
@@ -173,6 +174,7 @@ def test_alert_summaries_get_onhold(
         "revision",
         "push_timestamp",
         "prev_push_revision",
+        "original_prev_push_revision",
         "performance_tags",
     }
     assert len(resp.json()["results"][0]["alerts"]) == 1
@@ -240,6 +242,37 @@ def test_alert_summaries_put(
     assert PerformanceAlertSummary.objects.get(id=1).assignee == test_user
 
 
+def test_performance_alert_summary_change_from_revision(
+    client, test_perf_alert_summary, test_sheriff, test_push
+):
+    client.force_authenticate(user=test_sheriff)
+
+    # verify we can set revision
+    assert PerformanceAlertSummary.objects.get(id=1).prev_push.revision != test_push.revision
+    resp = client.put(
+        reverse("performance-alert-summaries-list") + "1/",
+        {"prev_push_revision": test_push.revision},
+    )
+    assert resp.status_code == 200
+    assert PerformanceAlertSummary.objects.get(id=1).prev_push.revision == test_push.revision
+
+    # verify we cannot set non-existing revision
+    resp = client.put(
+        reverse("performance-alert-summaries-list") + "1/",
+        {"prev_push_revision": "no-push-revision"},
+    )
+    assert resp.status_code == 400
+
+    # revert revision
+    original_revision = PerformanceAlertSummary.objects.get(id=1).original_prev_push.revision
+    resp = client.put(
+        reverse("performance-alert-summaries-list") + "1/",
+        {"prev_push_revision": original_revision},
+    )
+    assert resp.status_code == 200
+    assert PerformanceAlertSummary.objects.get(id=1).prev_push.revision == original_revision
+
+
 def test_performance_alert_summary_change_revision(
     client, test_perf_alert_summary, test_sheriff, test_push
 ):
@@ -254,7 +287,7 @@ def test_performance_alert_summary_change_revision(
     assert resp.status_code == 200
     assert PerformanceAlertSummary.objects.get(id=1).push.revision == test_push.revision
 
-    # verify we can set non-existing revision
+    # verify we cannot set non-existing revision
     resp = client.put(
         reverse("performance-alert-summaries-list") + "1/",
         {"revision": "no-push-revision"},

treeherder/perf/migrations/0058_performancealertsummary_original_prev_push_and_more.py

@@ -0,0 +1,64 @@
+# Generated by Django 5.1.4 on 2025-03-26 17:29
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+def update_summary_original_push(apps, schema_editor):
+    performancealertsummary = apps.get_model('perf', 'PerformanceAlertSummary')
+    for alert in performancealertsummary.objects.all():
+        alert.original_prev_push = alert.prev_push
+        alert.save()
+
+    performancealertsummarytesting = apps.get_model('perf', 'PerformanceAlertSummaryTesting')
+    for alert in performancealertsummarytesting.objects.all():
+        alert.original_prev_push = alert.prev_push
+        alert.save()
+
+    performancetetemetryalertsummary = apps.get_model('perf', 'PerformanceTelemetryAlertSummary')
+    for alert in performancetetemetryalertsummary.objects.all():
+        alert.original_prev_push = alert.prev_push
+        alert.save()
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("perf", "0057_performancealert_confidence_and_more"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="performancealertsummary",
+            name="original_prev_push",
+            field=models.ForeignKey(
+                default=None,
+                null=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="+",
+                to="model.push",
+            ),
+        ),
+        migrations.AddField(
+            model_name="performancealertsummarytesting",
+            name="original_prev_push",
+            field=models.ForeignKey(
+                default=None,
+                null=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="+",
+                to="model.push",
+            ),
+        ),
+        migrations.AddField(
+            model_name="performancetelemetryalertsummary",
+            name="original_prev_push",
+            field=models.ForeignKey(
+                default=None,
+                null=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="+",
+                to="model.push",
+            ),
+        ),
+    ]

treeherder/perf/models.py

@@ -311,6 +311,9 @@ class PerformanceAlertSummaryBase(models.Model):
     framework = models.ForeignKey(PerformanceFramework, on_delete=models.CASCADE)
 
     prev_push = models.ForeignKey(Push, on_delete=models.CASCADE, related_name="+")
+    original_prev_push = models.ForeignKey(
+        Push, on_delete=models.CASCADE, related_name="+", null=True, default=None
+    )
     push = models.ForeignKey(Push, on_delete=models.CASCADE, related_name="+")
     original_push = models.ForeignKey(
         Push, on_delete=models.CASCADE, related_name="+", null=True, default=None
@@ -389,6 +392,9 @@ def save(self, *args, update_fields=None, **kwargs):
         if not self.original_push:
             self.original_push = self.push
 
+        if not self.original_prev_push:
+            self.original_prev_push = self.prev_push
+
         super().save(*args, update_fields=update_fields, **kwargs)
         self.__prev_bug_number = self.bug_number
 

treeherder/webapp/api/performance_serializers.py

@@ -283,7 +283,14 @@ class PerformanceAlertSummarySerializer(serializers.ModelSerializer):
     )
     push_timestamp = TimestampField(source="push", read_only=True)
     prev_push_revision = serializers.SlugRelatedField(
-        read_only=True, slug_field="revision", source="prev_push"
+        read_only=False,
+        slug_field="revision",
+        source="prev_push",
+        required=False,
+        queryset=Push.objects.all(),
+    )
+    original_prev_push_revision = serializers.SlugRelatedField(
+        read_only=True, slug_field="revision", source="original_prev_push"
     )
     assignee_username = serializers.SlugRelatedField(
         slug_field="username",
@@ -333,6 +340,7 @@ class Meta:
             "revision",
             "push_timestamp",
             "prev_push_revision",
+            "original_prev_push_revision",
             "assignee_username",
             "assignee_email",
             "performance_tags",