FilterList: remove migration code to assign publicId

Author: glaubinix

src/Entity/FilterListEntry.php

@@ -48,8 +48,8 @@ class FilterListEntry
     #[ORM\Column]
     private \DateTimeImmutable $updatedAt;
 
-    #[ORM\Column(nullable: true)]
-    private ?string $publicId;
+    #[ORM\Column]
+    private string $publicId;
 
     public function __construct(RemoteFilterListEntry $remote)
     {
@@ -93,7 +93,7 @@ public function getPublicId(): ?string
         return $this->publicId;
     }
 
-    public function assignPublicId(): void
+    private function assignPublicId(): void
     {
         $this->publicId = IdGenerator::generateFilterListEntry();
     }

src/FilterList/FilterListResolver.php

@@ -20,18 +20,12 @@ class FilterListResolver
      * @param array<FilterListEntry>       $existingEntries
      * @param array<RemoteFilterListEntry> $remoteEntries
      *
-     * @return array{list<FilterListEntry>, list<FilterListEntry>, bool}
+     * @return array{list<FilterListEntry>, list<FilterListEntry>}
      */
     public function resolve(array $existingEntries, array $remoteEntries): array
     {
-        $modifiedExisting = false;
         $existingMap = [];
         foreach ($existingEntries as $existing) {
-            if (!$existing->getPublicId()) {
-                $existing->assignPublicId();
-                $modifiedExisting = true;
-            }
-
             $existingMap[$existing->getPackageName()][$existing->getVersion()] = $existing;
         }
 
@@ -58,7 +52,6 @@ public function resolve(array $existingEntries, array $remoteEntries): array
         return [
             $new,
             $unmatched,
-            $modifiedExisting,
         ];
     }
 }

src/Service/FilterListWorker.php

@@ -75,7 +75,7 @@ public function process(Job $job, SignalHandler $signal): array
 
         /** @var FilterListEntry[] $existingEntries */
         $existingEntries = $this->doctrine->getRepository(FilterListEntry::class)->getEntriesInList($list);
-        [$new, $removed, $modifiedExisting] = $this->malwareFeedResolver->resolve($existingEntries, $remoteEntries);
+        [$new, $removed] = $this->malwareFeedResolver->resolve($existingEntries, $remoteEntries);
 
         foreach ($new as $entry) {
             $this->doctrine->getManager()->persist($entry);
@@ -85,7 +85,7 @@ public function process(Job $job, SignalHandler $signal): array
             $this->doctrine->getManager()->remove($entry);
         }
 
-        if ($new !== [] || $removed !== [] || $modifiedExisting) {
+        if ($new !== [] || $removed !== []) {
             $this->doctrine->getManager()->flush();
         }
 

tests/FilterList/FilterListResolverTest.php

@@ -43,19 +43,7 @@ public function testExistingEntryWithTwoRemoteEntriesResultsInNoChange(): void
         $remote = $this->createRemoteFilterListEntry('vendor/package', '1.0.0');
         $result = $this->resolver->resolve([$existing], [$remote, $remote]);
 
-        $this->assertSame([[], [], false], $result);
-    }
-
-    public function testExistingWithoutIdAssignsNewPublicId(): void
-    {
-        $existing = new FilterListEntry($this->createRemoteFilterListEntry('vendor/package', '1.0.0'));
-        $this->unsetPublicId($existing);
-        $this->assertNull($existing->getPublicId());
-        $remote = $this->createRemoteFilterListEntry('vendor/package', '1.0.0');
-        $result = $this->resolver->resolve([$existing], [$remote, $remote]);
-
-        $this->assertSame([[], [], true], $result);
-        $this->assertNotNull($existing->getPublicId());
+        $this->assertSame([[], []], $result);
     }
 
     public function testResolveRemoveOldEntry(): void
@@ -98,7 +86,7 @@ public function testResolveEmpty(): void
     {
         $result = $this->resolver->resolve([], []);
 
-        $this->assertSame([[], [], false], $result);
+        $this->assertSame([[], []], $result);
     }
 
     public function testResolveMultipleVersionsSamePackage(): void