Added IP row in "alert" column

Author: Dean151

migrations/Version20220730170339.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 Version20220730170339 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 aln_alert ADD ip VARCHAR(64) DEFAULT NULL, DROP time, DROP amount');
+    }
+
+    public function down(Schema $schema): void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE aln_alert ADD time VARCHAR(5) DEFAULT NULL, ADD amount SMALLINT DEFAULT NULL, DROP ip');
+    }
+}

src/Entity/AlnAlert.php

@@ -4,7 +4,6 @@
 
 namespace App\Entity;
 
-use App\Dbal\Types\AlnTimeType;
 use App\Repository\AlnAlertRepository;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Mapping as ORM;
@@ -30,14 +29,8 @@ class AlnAlert
     #[ORM\ManyToOne]
     private ?AlnFeeder $feeder = null;
 
-    /**
-     * @var ?array{hours: int<0, 23>, minutes: int<0, 59>}
-     */
-    #[ORM\Column(type: AlnTimeType::ALN_TIME_TYPE, nullable: true)]
-    private ?array $time = null;
-
-    #[ORM\Column(type: Types::SMALLINT, nullable: true)]
-    private ?int $amount = null;
+    #[ORM\Column(length: 64, nullable: true)]
+    private ?string $ip = null;
 
     public function __construct()
     {
@@ -98,32 +91,14 @@ public function setFeeder(?AlnFeeder $feeder): self
         return $this;
     }
 
-    /**
-     * @return ?array{hours: int<0, 23>, minutes: int<0, 59>}
-     */
-    public function getTime(): ?array
-    {
-        return $this->time;
-    }
-
-    /**
-     * @param ?array{hours: int<0, 23>, minutes: int<0, 59>} $time
-     */
-    public function setTime(?array $time): self
-    {
-        $this->time = $time;
-
-        return $this;
-    }
-
-    public function getAmount(): ?int
+    public function getIp(): ?string
     {
-        return $this->amount;
+        return $this->ip;
     }
 
-    public function setAmount(?int $amount): self
+    public function setIp(?string $ip): self
     {
-        $this->amount = $amount;
+        $this->ip = $ip;
 
         return $this;
     }

src/Socket/FeederCommunicator.php

@@ -90,6 +90,9 @@ public function onData(ConnectionInterface $from, string $data): void
             $this->logger->warning($e->getMessage(), ['exception' => $e]);
 
             $alert = new AlnAlert();
+            if ($ip = $this->getIpFrom($from)) {
+                $alert->setIp($ip);
+            }
             $alert->setMessage($e->getMessage());
             if ($identifier = array_search($from, $this->connections, true)) {
                 $feeder = $this->feederRepository->findOneByIdentifier($identifier);
@@ -153,11 +156,7 @@ private function identified(IdentificationMessage $message, ConnectionInterface
 
         $feeder = $this->feederRepository->findOrCreateFeeder($message->getIdentifier());
         $feeder->setLastSeen(new DateTimeImmutable('now'));
-
-        if ($address = $connection->getRemoteAddress()) {
-            $host = parse_url($address, PHP_URL_HOST);
-            assert(is_string($host));
-            $ip = trim($host, '[]');
+        if ($ip = $this->getIpFrom($connection)) {
             $feeder->setIp($ip);
         }
 
@@ -183,4 +182,17 @@ private function recordManualMeal(MealButtonPressedMessage $message): void
         $this->doctrine->getManager()->flush();
         // TODO: send push?
     }
+
+    private function getIpFrom(ConnectionInterface $connection): ?string
+    {
+        if (!$address = $connection->getRemoteAddress()) {
+            return null;
+        }
+        $host = parse_url($address, PHP_URL_HOST);
+        if (!is_string($host)) {
+            return null;
+        }
+
+        return trim($host, '[]');
+    }
 }