review comments - use correct types for this new field

jolicode · Sep 19, 2023 · aab373a · aab373a
1 parent ed55f97
commit aab373a
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git a/migrations/Version20230918170924.php b/migrations/Version20230918170924.php
@@ -26,6 +26,7 @@ public function getDescription(): string
     public function up(Schema $schema): void
     {
         $this->addSql('ALTER TABLE standup_meeting_reminder ADD forecast_clients LONGTEXT NOT NULL COMMENT \'(DC2Type:array)\'');
+        $this->addSql('UPDATE standup_meeting_reminder SET forecast_clients="a:0:{}"');
     }
 
     public function down(Schema $schema): void

diff --git a/src/Controller/Admin/StandupMeetingReminderCrudController.php b/src/Controller/Admin/StandupMeetingReminderCrudController.php
@@ -32,6 +32,7 @@ public function configureFields(string $pageName): iterable
         return [
             AssociationField::new('slackTeam')->onlyOnIndex(),
             TextField::new('channelId')->onlyOnIndex(),
+            ArrayField::new('forecastClients')->onlyOnIndex(),
             ArrayField::new('forecastProjects')->onlyOnIndex(),
             TextField::new('updatedBy')->onlyOnIndex(),
             TextField::new('time'),

diff --git a/src/Entity/StandupMeetingReminder.php b/src/Entity/StandupMeetingReminder.php
@@ -35,13 +35,13 @@ class StandupMeetingReminder
     private string $channelId;
 
     /**
-     * @var array<array-key, int>
+     * @var array<array-key, string>
      */
     #[ORM\Column(type: 'array')]
     private array $forecastClients = [];
 
     /**
-     * @var array<array-key, int>
+     * @var array<array-key, string>
      */
     #[ORM\Column(type: 'array')]
     private array $forecastProjects = [];
@@ -98,15 +98,15 @@ public function setChannelId(string $channelId): self
     }
 
     /**
-     * @return array<array-key, int>
+     * @return array<array-key, string>
      */
-    public function getForecastClients(): ?array
+    public function getForecastClients(): array
     {
         return $this->forecastClients;
     }
 
     /**
-     * @param array<array-key, int> $forecastClients
+     * @param array<array-key, string> $forecastClients
      */
     public function setForecastClients(array $forecastClients): self
     {
@@ -116,15 +116,15 @@ public function setForecastClients(array $forecastClients): self
     }
 
     /**
-     * @return array<array-key, int>
+     * @return array<array-key, string>
      */
-    public function getForecastProjects(): ?array
+    public function getForecastProjects(): array
     {
         return $this->forecastProjects;
     }
 
     /**
-     * @param array<array-key, int> $forecastProjects
+     * @param array<array-key, string> $forecastProjects
      */
     public function setForecastProjects(array $forecastProjects): self
     {

diff --git a/src/StandupMeetingReminder/Sender.php b/src/StandupMeetingReminder/Sender.php
@@ -106,8 +106,8 @@ private function findParticipants(StandupMeetingReminder $standupMeetingReminder
                 $projectId = $assignment->getProjectId();
 
                 if (
-                    (0 === \count((array) $standupMeetingReminder->getForecastClients()) || \in_array((string) $projects[$projectId]->getClientId(), $standupMeetingReminder->getForecastClients(), true))
-                    && (0 === \count((array) $standupMeetingReminder->getForecastProjects()) || \in_array((string) $projectId, $standupMeetingReminder->getForecastProjects(), true))
+                    (0 === \count($standupMeetingReminder->getForecastClients()) || \in_array((string) $projects[$projectId]->getClientId(), $standupMeetingReminder->getForecastClients(), true))
+                    && (0 === \count($standupMeetingReminder->getForecastProjects()) || \in_array((string) $projectId, $standupMeetingReminder->getForecastProjects(), true))
                 ) {
                     if (null !== $assignment->getPersonId()) {
                         $members[$people[$assignment->getPersonId()]->getEmail()] = $memberName = sprintf(