Track next metadata revision on the version entity

Author: codedmonkey

migrations/Version20260513125839.php

@@ -0,0 +1,36 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20260513125839 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Add next_revision counter to version table';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql(<<<'SQL'
+            ALTER TABLE version ADD next_revision INT DEFAULT NULL
+        SQL);
+        $this->addSql(<<<'SQL'
+            UPDATE version SET next_revision = COALESCE((SELECT MAX(revision) FROM metadata WHERE metadata.version_id = version.id), 0) + 1
+        SQL);
+        $this->addSql(<<<'SQL'
+            ALTER TABLE version ALTER next_revision SET NOT NULL
+        SQL);
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql(<<<'SQL'
+            ALTER TABLE version DROP next_revision
+        SQL);
+    }
+}

src/Doctrine/Entity/Version.php

@@ -29,6 +29,9 @@ class Version extends TrackedEntity implements \Stringable
     #[ORM\Column]
     private bool $defaultBranch = false;
 
+    #[ORM\Column]
+    private int $nextRevision = 1;
+
     #[ORM\Column(nullable: true)]
     private ?\DateTimeImmutable $updatedAt = null;
 
@@ -114,6 +117,17 @@ public function setDefaultBranch(bool $defaultBranch): void
         $this->defaultBranch = $defaultBranch;
     }
 
+    public function getNextRevision(bool $increment = false): int
+    {
+        $nextRevision = $this->nextRevision;
+
+        if ($increment) {
+            ++$this->nextRevision;
+        }
+
+        return $nextRevision;
+    }
+
     public function getUpdatedAt(): ?\DateTimeImmutable
     {
         return $this->updatedAt;

src/Doctrine/EventListener/MetadataListener.php

@@ -122,22 +122,4 @@ public function fetchMetadataCollections(Metadata ...$metadata): void
             ->getQuery()
             ->getResult();
     }
-
-    public function getNextRevision(Metadata $metadata): int
-    {
-        $version = $metadata->getVersion();
-
-        if (null === $version->getId()) {
-            return 1;
-        }
-
-        $lastRevision = $this->createQueryBuilder('metadata')
-            ->select('MAX(metadata.revision)')
-            ->where('metadata.version = :version')
-            ->setParameter('version', $metadata->getVersion())
-            ->getQuery()
-            ->getSingleScalarResult();
-
-        return (int) $lastRevision + 1;
-    }
 }

src/Doctrine/Repository/MetadataRepository.php

@@ -235,6 +235,7 @@ private function updateVersion(Version $version, CompletePackageInterface $data,
         $metadata = $this->createMetadata($version, $data, $driver);
 
         if (null === $currentMetadata || $this->hasMetadataChanged($currentMetadata, $metadata)) {
+            $metadata->setRevision($version->getNextRevision(increment: true));
             $version->setCurrentMetadata($metadata);
 
             $this->entityManager->persist($metadata);

src/Package/PackageMetadataResolver.php

@@ -17,6 +17,7 @@ protected function createMockMetadata(Version $version): Metadata
         $package = $version->getPackage();
 
         $metadata = new Metadata($version);
+        $metadata->setRevision($version->getNextRevision());
         $metadata->setPackageName($package->getName());
         $metadata->setVersionName($version->getName());
         $metadata->setNormalizedVersionName($version->getNormalizedName());