Refactor PackageDistributionResolver to use Metadata entities

Author: codedmonkey

src/Controller/ApiController.php

@@ -7,8 +7,8 @@
 use CodedMonkey\Dirigent\Attribute\IsGrantedAccess;
 use CodedMonkey\Dirigent\Attribute\MapPackage;
 use CodedMonkey\Dirigent\Doctrine\Entity\Package;
+use CodedMonkey\Dirigent\Doctrine\Repository\MetadataRepository;
 use CodedMonkey\Dirigent\Doctrine\Repository\PackageRepository;
-use CodedMonkey\Dirigent\Doctrine\Repository\VersionRepository;
 use CodedMonkey\Dirigent\Entity\PackageFetchStrategy;
 use CodedMonkey\Dirigent\Entity\PackageUpdateSource;
 use CodedMonkey\Dirigent\Message\TrackInstallations;
@@ -37,7 +37,7 @@ class ApiController extends AbstractController
     public function __construct(
         private readonly EntityManagerInterface $entityManager,
         private readonly PackageRepository $packageRepository,
-        private readonly VersionRepository $versionRepository,
+        private readonly MetadataRepository $metadataRepository,
         private readonly PackageMetadataResolver $metadataResolver,
         private readonly PackageDistributionResolver $distributionResolver,
         private readonly PackageProviderManager $providerManager,
@@ -131,15 +131,15 @@ public function packageDistribution(Request $request, string $reference, string
                 throw $this->createNotFoundException();
             }
 
-            if (null === $version = $this->versionRepository->findOneByNormalizedName($package, $versionName)) {
+            if (null === $metadata = $this->metadataRepository->findOneByNormalizedNameAndReference($package, $versionName, $reference)) {
                 throw $this->createNotFoundException();
             }
 
-            if ($version->isDevelopment() && !$this->getParameter('dirigent.distributions.dev_versions')) {
+            if ($metadata->getVersion()->isDevelopment() && !$this->getParameter('dirigent.distributions.dev_versions')) {
                 throw $this->createNotFoundException();
             }
 
-            if (!$this->distributionResolver->resolve($version, $reference, $type)) {
+            if (!$this->distributionResolver->resolve($metadata, $type)) {
                 throw $this->createNotFoundException();
             }
         }

src/Doctrine/Repository/MetadataRepository.php

@@ -73,6 +73,21 @@ public function findAllMetadataForVersion(Version $version): array
         );
     }
 
+    public function findOneByNormalizedNameAndReference(Package $package, string $normalizedVersionName, string $reference): ?Metadata
+    {
+        $builder = $this->createQueryBuilder('metadata')
+            ->leftJoin('metadata.version', 'version')
+            ->andWhere('metadata.package = :package')
+            ->andWhere('version.normalizedName = :versionName')
+            ->andWhere('metadata.sourceReference = :reference OR (metadata.sourceReference IS NULL AND metadata.distributionReference = :reference)')
+            ->setParameter('package', $package)
+            ->setParameter('versionName', $normalizedVersionName)
+            ->setParameter('reference', $reference)
+            ->setMaxResults(1);
+
+        return $builder->getQuery()->getOneOrNullResult();
+    }
+
     /**
      * Returns a map of version ID => metadata count for all versions of the given package.
      *

src/Package/PackageDistributionResolver.php

@@ -5,7 +5,7 @@
 namespace CodedMonkey\Dirigent\Package;
 
 use CodedMonkey\Dirigent\Composer\ComposerClient;
-use CodedMonkey\Dirigent\Doctrine\Entity\Version;
+use CodedMonkey\Dirigent\Doctrine\Entity\Metadata;
 use Symfony\Component\DependencyInjection\Attribute\Autowire;
 use Symfony\Component\Filesystem\Filesystem;
 
@@ -33,18 +33,17 @@ public function path(string $packageName, string $versionName, string $reference
         return "{$this->storagePath}/{$packageName}/{$versionName}-{$reference}.{$type}";
     }
 
-    public function resolve(Version $version, string $reference, string $type): bool
+    public function resolve(Metadata $metadata, string $type): bool
     {
-        $package = $version->getPackage();
+        $package = $metadata->getPackage();
         $packageName = $package->getName();
-        $versionName = $version->getNormalizedName();
+        $versionName = $metadata->getNormalizedVersionName();
+        $reference = $metadata->getDistributionReference();
 
         if ($this->exists($packageName, $versionName, $reference, $type)) {
             return true;
         }
 
-        $metadata = $version->getCurrentMetadata();
-
         if ($reference !== $metadata->getDistributionReference() || $type !== $metadata->getDistributionType()) {
             return false;
         }