3666: Set last contact at for servers

Author: turegjorup

.env

@@ -60,3 +60,6 @@ OIDC_CLI_LOGIN_ROUTE=OIDC_CLI_LOGIN_ROUTE_TEST
 VAULT_URL=https://vault.itkdev.dk
 VAULT_ROLE_ID="CHANGE_ME_IN_LOCAL_ENV"
 VAULT_SECRET_ID="CHANGE_ME_IN_LOCAL_ENV"
+
+# The number of old results for each server/result-type combination
+APP_KEEP_RESULTS=5

migrations/Version20250123132456.php

@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20250123132456 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return '';
+    }
+
+    public function up(Schema $schema): void
+    {
+        // this up() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE server ADD last_contact_at DATETIME NULL');
+    }
+
+    public function down(Schema $schema): void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE server DROP last_contact_at');
+    }
+}

src/Entity/Server.php

@@ -85,6 +85,9 @@ class Server extends AbstractBaseEntity implements UserInterface, \Stringable
     #[ORM\Column(type: 'string', length: 10)]
     private string $type;
 
+    #[ORM\Column(type: 'datetime_immutable', nullable: true)]
+    private ?\DateTimeImmutable $lastContactAt;
+
     /**
      * @throws \Exception
      */
@@ -389,4 +392,18 @@ public function setType(string $type): self
 
         return $this;
     }
+
+    public function getLastContactAt(): ?\DateTimeImmutable
+    {
+        return $this->lastContactAt;
+    }
+
+    public function updateLastContactAt(\DateTimeImmutable $lastContactAt): static
+    {
+        if (null === $this->lastContactAt || $this->lastContactAt < $lastContactAt) {
+            $this->lastContactAt = $lastContactAt;
+        }
+
+        return $this;
+    }
 }

src/MessageHandler/PersistDetectionResultHandler.php

@@ -10,6 +10,7 @@
 use App\Repository\ServerRepository;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\Messenger\Attribute\AsMessageHandler;
+use Symfony\Component\Messenger\Exception\UnrecoverableMessageHandlingException;
 use Symfony\Component\Messenger\MessageBusInterface;
 
 #[AsMessageHandler]
@@ -26,30 +27,37 @@ public function __construct(
     public function __invoke(PersistDetectionResult $message): void
     {
         $server = $this->serverRepository->findOneBy(['apiKey' => $message->serverApiKey]);
-        $detectionResult = $message->detectionResult;
 
-        $detectionResult->setServer($server);
+        if (null === $server) {
+            throw new UnrecoverableMessageHandlingException('Server not found.');
+        }
 
-        $hash = $detectionResult->generateHash()->getHash();
-        $result = $this->detectionResultRepository->findOneBy(['server' => $server, 'hash' => $hash]);
+        $server->updateLastContactAt($message->receivedAt);
 
-        if (null === $result) {
-            $this->entityManager->persist($detectionResult);
-            $detectionResult->setLastContact($message->receivedAt);
-        } else {
+        $result = $message->detectionResult;
+        $result->setServer($server);
+
+        $hash = $result->generateHash()->getHash();
+        $existingResult = $this->detectionResultRepository->findOneBy(['server' => $server, 'hash' => $hash]);
+
+        // New results should trigger cleanup and be sent to the queue for further processing.
+        if (null === $existingResult) {
+            $this->entityManager->persist($result);
             $result->setLastContact($message->receivedAt);
-        }
 
-        $this->entityManager->flush();
+            $this->entityManager->flush();
 
-        // New DetectionResults should be sent to processing
-        if (null === $result) {
-            $id = $detectionResult->getId();
+            $id = $result->getId();
             if (null !== $id) {
                 $this->messageBus->dispatch(
                     new ProcessDetectionResult($id)
                 );
             }
+        // Existing results will only update timestamps
+        } else {
+            $existingResult->setLastContact($message->receivedAt);
+
+            $this->entityManager->flush();
         }
 
         $this->entityManager->clear();