Optimize fetching of package update data

Author: codedmonkey

src/Doctrine/Entity/Package.php

@@ -520,6 +520,19 @@ public function getDevBranchVersions(): array
         return array_filter($this->getSortedVersions(), static fn (Version $version) => str_starts_with($version->getNormalizedName(), 'dev-'));
     }
 
+    public function getVersionByNormalizedName(string $normalizedName): ?Version
+    {
+        $normalizedName = strtolower($normalizedName);
+
+        foreach ($this->versions as $version) {
+            if ($normalizedName === strtolower($version->getNormalizedName())) {
+                return $version;
+            }
+        }
+
+        return null;
+    }
+
     /**
      * Sort versions from newest to oldest.
      */

src/Doctrine/Repository/PackageRepository.php

@@ -28,6 +28,7 @@ class PackageRepository extends ServiceEntityRepository
 
     public function __construct(
         ManagerRegistry $registry,
+        private readonly MetadataRepository $metadataRepository,
         #[Autowire(param: 'dirigent.packages.periodic_update_interval')]
         ?string $periodicUpdateInterval,
     ) {
@@ -174,4 +175,24 @@ public function deletePackageLinks(Package $package): void
             $connection->executeStatement('DELETE FROM package_suggest_link WHERE package_id = :id', $queryParameters);
         });
     }
+
+    public function fetchPackageDataForUpdate(Package $package): void
+    {
+        /** @var Version[] $versions */
+        $versions = $this->getEntityManager()->createQueryBuilder()
+            ->select('version', 'currentMetadata')
+            ->from(Version::class, 'version')
+            ->leftJoin('version.currentMetadata', 'currentMetadata')
+            ->where('version.package = :package')
+            ->setParameter('package', $package)
+            ->getQuery()
+            ->getResult();
+
+        $metadataCollection = array_map(
+            static fn (Version $version) => $version->getCurrentMetadata(),
+            $versions
+        );
+
+        $this->metadataRepository->fetchMetadataCollections(...$metadataCollection);
+    }
 }

src/Doctrine/Repository/VersionRepository.php

@@ -44,23 +44,4 @@ public function findOneByNormalizedName(Package $package, string $name): ?Versio
     {
         return $this->findOneBy(['package' => $package, 'normalizedName' => $name]);
     }
-
-    /**
-     * @return array<string, int>
-     */
-    public function getVersionMetadataForUpdate(Package $package): array
-    {
-        $rows = $this->getEntityManager()->getConnection()->fetchAllAssociative(
-            'SELECT id, normalized_name FROM version v WHERE v.package_id = :id',
-            ['id' => $package->getId()],
-        );
-
-        $versions = [];
-        foreach ($rows as $row) {
-            $key = strtolower((string) $row['normalized_name']);
-            $versions[$key] = $row['id'];
-        }
-
-        return $versions;
-    }
 }

src/Package/PackageMetadataResolver.php

@@ -12,8 +12,8 @@
 use CodedMonkey\Dirigent\Doctrine\Entity\RegistryPackageMirroring;
 use CodedMonkey\Dirigent\Doctrine\Entity\Version;
 use CodedMonkey\Dirigent\Doctrine\Repository\KeywordRepository;
+use CodedMonkey\Dirigent\Doctrine\Repository\PackageRepository;
 use CodedMonkey\Dirigent\Doctrine\Repository\RegistryRepository;
-use CodedMonkey\Dirigent\Doctrine\Repository\VersionRepository;
 use CodedMonkey\Dirigent\Entity\MetadataLinkType;
 use CodedMonkey\Dirigent\Message\DumpPackageProvider;
 use CodedMonkey\Dirigent\Message\UpdatePackageLinks;
@@ -35,7 +35,7 @@ public function __construct(
         private EntityManagerInterface $entityManager,
         private KeywordRepository $keywordRepository,
         private RegistryRepository $registryRepository,
-        private VersionRepository $versionRepository,
+        private PackageRepository $packageRepository,
     ) {
     }
 
@@ -142,7 +142,12 @@ private function resolveVcsRepository(Package $package): void
      */
     private function updatePackage(Package $package, array $composerPackages, ?VcsDriverInterface $driver = null): void
     {
-        $existingVersionMetadata = $this->versionRepository->getVersionMetadataForUpdate($package);
+        $this->packageRepository->fetchPackageDataForUpdate($package);
+
+        $existingVersionMetadata = [];
+        foreach ($package->getVersions() as $version) {
+            $existingVersionMetadata[strtolower($version->getNormalizedName())] = $version;
+        }
 
         /** @var ?Version $primaryVersion Version to use as the package info source */
         $primaryVersion = null;
@@ -156,9 +161,7 @@ private function updatePackage(Package $package, array $composerPackages, ?VcsDr
             }
 
             $key = strtolower($composerPackage->getVersion());
-            if ($versionId = $existingVersionMetadata[$key] ?? null) {
-                $version = $this->entityManager->getReference(Version::class, $versionId);
-            } else {
+            if (null === $version = $existingVersionMetadata[$key] ?? null) {
                 $version = new Version($package);
                 $version->setName($composerPackage->getPrettyVersion());
                 $version->setNormalizedName($composerPackage->getVersion());
@@ -200,8 +203,7 @@ private function updatePackage(Package $package, array $composerPackages, ?VcsDr
         }
 
         // Remove outdated versions
-        foreach ($existingVersionMetadata as $versionId) {
-            $version = $this->entityManager->getReference(Version::class, $versionId);
+        foreach ($existingVersionMetadata as $version) {
             $this->entityManager->remove($version);
         }