landing_job: add landed revisions receipt (bug 1834885)

- add diff_id to revision_landing_job table
- add method to set diff IDs and call it at landing time
- add landed_revisions helper method to fetch revision_to_diff_ids

landoapi/models/landing_job.py

@@ -135,8 +135,20 @@ class LandingJob(Base):
     )
 
     @property
-    def landing_path(self) -> list[tuple[int, int]]:
-        return [(revision.revision_id, revision.diff_id) for revision in self.revisions]
+    def landed_revisions(self):
+        revision_ids = [revision.id for revision in self.revisions]
+        revision_to_diff_ids_query = (
+            revision_landing_job.select()
+            .where(
+                revision_landing_job.c.revision_id.in_(revision_ids),
+                revision_landing_job.c.landing_job_id == self.id,
+            )
+            .with_only_columns(
+                revision_landing_job.c.revision_id, revision_landing_job.c.diff_id
+            )
+            .order_by(revision_landing_job.c.index)
+        )
+        return dict(list(db.session.execute(revision_to_diff_ids_query)))
 
     @property
     def serialized_landing_path(self):
@@ -147,7 +159,7 @@ def serialized_landing_path(self):
                     "revision_id": "D{}".format(revision_id),
                     "diff_id": diff_id,
                 }
-                for revision_id, diff_id in self.landing_path
+                for revision_id, diff_id in self.landed_revisions.items()
             ]
         else:
             return [
@@ -249,6 +261,19 @@ def sort_revisions(self, revisions: list[Revision]):
                 .values(index=index)
             )
 
+    def set_landed_revision_diffs(self):
+        """Assign diff_ids, if available, to each association row."""
+        # Update association table records with current diff_id values.
+        for revision in self.revisions:
+            db.session.execute(
+                revision_landing_job.update()
+                .where(revision_landing_job.c.landing_job_id == self.id)
+                .where(
+                    revision_landing_job.c.revision_id == revision.id,
+                )
+                .values(diff_id=revision.diff_id)
+            )
+
     def transition_status(
         self,
         action: LandingJobAction,
@@ -303,6 +328,7 @@ def transition_status(
 
         if action == LandingJobAction.LAND:
             self.landed_commit_id = kwargs["commit_id"]
+            self.set_landed_revision_diffs()
 
         if commit:
             db.session.commit()

landoapi/models/revisions.py

@@ -36,11 +36,13 @@ class DiffWarningGroup(enum.Enum):
 
 
 # Association table with custom "index" column to guarantee sorting of revisions.
+# The diff_id column is used as a transaction record of the diff_id at landing time.
 revision_landing_job = db.Table(
     "revision_landing_job",
     db.Column("landing_job_id", db.ForeignKey("landing_job.id")),
     db.Column("revision_id", db.ForeignKey("revision.id")),
     db.Column("index", db.Integer),
+    db.Column("diff_id", db.Integer, nullable=True),
 )
 
 

landoapi/transplants.py

@@ -224,9 +224,7 @@ def warning_previously_landed(*, revision, diff, **kwargs):
     if job is None:
         return None
 
-    revision_to_diff_id = {
-        revision.revision_id: revision.diff_id for revision in job.revisions
-    }
+    revision_to_diff_id = job.landed_revisions
     if job.revision_to_diff_id:
         legacy_data = {
             int(revision_id): int(diff_id)

migrations/versions/50ffadceca83_add_revision_landing_job_diff_id.py

@@ -0,0 +1,30 @@
+"""add revision_landing_job.diff_id
+
+Revision ID: 50ffadceca83
+Revises: a8cd4d43c4c3
+Create Date: 2023-05-25 01:50:36.755884
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = "50ffadceca83"
+down_revision = "a8cd4d43c4c3"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column(
+        "revision_landing_job", sa.Column("diff_id", sa.Integer(), nullable=True)
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column("revision_landing_job", "diff_id")
+    # ### end Alembic commands ###