From a676e397b9c4a090c729f21abc1862fd628a4bc6 Mon Sep 17 00:00:00 2001
From: JSweers <j.e.sweers@student.utwente.nl>
Date: Mon, 29 Dec 2025 23:12:53 +0100
Subject: [PATCH] Refactoring of Options to Option array

---
 composer.json                     |  2 +-
 src/Poll/Model/Options.php        | 83 -------------------------------
 src/Poll/Model/Poll.php           | 15 +++++-
 src/Poll/PollDatabaseManager.php  | 54 ++++----------------
 tests/PollDatabaseManagerTest.php | 10 ++--
 5 files changed, 30 insertions(+), 134 deletions(-)
 delete mode 100644 src/Poll/Model/Options.php

diff --git a/composer.json b/composer.json
index 32f379e..5203f63 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "compucie/database",
     "description": "Library of database managers used by Newton's systems.",
-    "version": "6.0.1",
+    "version": "6.1.0",
     "type": "library",
     "license": "MIT",
     "autoload": {
diff --git a/src/Poll/Model/Options.php b/src/Poll/Model/Options.php
deleted file mode 100644
index 2671033..0000000
--- a/src/Poll/Model/Options.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-
-namespace Compucie\Database\Poll\Model;
-
-class Options
-{
-    /**
-     * @var array<int> $ids
-     */
-    private array $ids;
-    /**
-     * @var array<string> $texts
-     */
-    private array $texts;
-    /**
-     * @var array<int> $voteCounts
-     */
-    private array $voteCounts;
-
-    /**
-     * @param array<int> $ids
-     * @param array<string> $texts
-     * @param array<int> $voteCounts
-     */
-    public function __construct(
-        array $ids = array(),
-        array $texts = array(),
-        array $voteCounts = array(),
-    ) {
-        $this->ids = array();
-        $this->texts = array();
-        $this->voteCounts = array();
-
-        foreach ($ids as $id) {
-            $this->registerId($id);
-        }
-
-        foreach ($texts as $id => $text) {
-            $this->setText((int)$id, (string)$text);
-        }
-
-        foreach ($voteCounts as $id => $count) {
-            $this->setVoteCount((int)$id, (int)$count);
-        }
-    }
-
-    public function getText(int $id): string
-    {
-        return $this->texts[$id] ?? '';
-    }
-
-    public function getVoteCount(int $id): int
-    {
-        return $this->voteCounts[$id] ?? 0;
-    }
-
-    public function setText(int $id, string $text): void
-    {
-        $this->texts[$id] = $text;
-        $this->registerId($id);
-    }
-
-    public function setVoteCount(int $id, int $voteCount): void
-    {
-        $this->voteCounts[$id] = $voteCount;
-        $this->registerId($id);
-    }
-
-    /**
-     * @return array<int>
-     */
-    public function getIds(): array
-    {
-        return $this->ids;
-    }
-
-    private function registerId(int $id): void
-    {
-        if (!in_array($id, $this->ids)) {
-            $this->ids[] = $id;
-        }
-    }
-}
diff --git a/src/Poll/Model/Poll.php b/src/Poll/Model/Poll.php
index 2631e29..7d8b632 100644
--- a/src/Poll/Model/Poll.php
+++ b/src/Poll/Model/Poll.php
@@ -9,12 +9,20 @@
  */
 readonly class Poll
 {
+    /**
+     * @param int $id
+     * @param string $question
+     * @param DateTime $publishedAt
+     * @param DateTime $expiresAt
+     * @param array<Option> $options
+     * @param int $voteCount
+     */
     public function __construct(
         private int      $id,
         private string   $question,
         private DateTime $publishedAt,
         private DateTime $expiresAt,
-        private Options  $options,
+        private array  $options,
         private int      $voteCount,
     ) {
     }
@@ -39,7 +47,10 @@ public function getExpiresAt(): DateTime
         return $this->expiresAt;
     }
 
-    public function getOptions(): Options
+    /**
+     * @return array<Option>
+     */
+    public function getOptions(): array
     {
         return $this->options;
     }
diff --git a/src/Poll/PollDatabaseManager.php b/src/Poll/PollDatabaseManager.php
index bb1a0e7..a43a6fd 100644
--- a/src/Poll/PollDatabaseManager.php
+++ b/src/Poll/PollDatabaseManager.php
@@ -4,7 +4,6 @@
 
 use Compucie\Database\DatabaseManager;
 use Compucie\Database\Poll\Model\Option;
-use Compucie\Database\Poll\Model\Options;
 use Compucie\Database\Poll\Model\Poll;
 use Compucie\Database\Poll\Model\Vote;
 use DateTime;
@@ -118,7 +117,6 @@ public function getPoll(int $pollId): ?Poll
         }
 
         $options            = $this->getOptions($pollId);
-        $optionsVoteCounted = $this->getVoteCounts($pollId, $options);
         $pollVoteCount      = $this->getPollVoteCount($pollId);
 
         return new Poll(
@@ -126,7 +124,7 @@ public function getPoll(int $pollId): ?Poll
             (string)$row['question'],
             safeDateTime((string)$row['published_at']),
             safeDateTime((string)$row['expires_at']),
-            $optionsVoteCounted,
+            $options,
             $pollVoteCount
         );
     }
@@ -390,13 +388,13 @@ public function getOption(int $optionId): ?Option
     /**
      * Return the options for the given poll.
      * @param   int     $pollId     ID of the poll for which to get the options.
-     * @return  Options             Object with the options.
+     * @return  array<Option>       Object with the options.
      * @throws  mysqli_sql_exception
      */
-    public function getOptions(int $pollId): Options
+    public function getOptions(int $pollId): array
     {
         if ($pollId <= 0) {
-            return new Options();
+            return array();
         }
 
         $rows = $this->executeReadAll(
@@ -407,13 +405,16 @@ public function getOptions(int $pollId): Options
             "i"
         );
 
-        $options = new Options();
+        $options = array();
 
         foreach ($rows as $row) {
-            $options->setText(
-                (int)$row['option_id'],
-                (string)$row['text']
+            $option = new Option(
+                $row['option_id'],
+                $pollId,
+                $row['text'],
+                $this->getVotes($row['option_id'])
             );
+            $options[] = $option;
         }
 
         return $options;
@@ -448,39 +449,6 @@ public function deleteOption(int $optionId): bool
         return $this->executeDelete('options', 'option_id', $optionId);
     }
 
-    /**
-     * Return the options and the vote count for each option.
-     * The value is another array that contains the option text and the vote count.
-     * @param   int         $pollId     ID of the poll for which to get the vote counts.
-     * @param   Options     $options    Object with the options.
-     * @return  Options                 Object with the options and their vote counts.
-     * @throws  mysqli_sql_exception
-     */
-    private function getVoteCounts(int $pollId, Options $options): Options
-    {
-        $rows = $this->executeReadAll(
-            "SELECT `option_id`, COUNT(*) AS cnt
-         FROM `votes`
-         WHERE `poll_id` = ?
-         GROUP BY `option_id`",
-            [$pollId],
-            "i"
-        );
-
-        foreach ($options->getIds() as $optionId) {
-            $options->setVoteCount($optionId, 0);
-        }
-
-        foreach ($rows as $row) {
-            $options->setVoteCount(
-                (int)$row['option_id'],
-                (int)$row['cnt']
-            );
-        }
-
-        return $options;
-    }
-
     /* ------------- VOTES ------------- */
 
     /**
diff --git a/tests/PollDatabaseManagerTest.php b/tests/PollDatabaseManagerTest.php
index f7220c9..6113c7c 100644
--- a/tests/PollDatabaseManagerTest.php
+++ b/tests/PollDatabaseManagerTest.php
@@ -288,11 +288,11 @@ function testGetPoll(): void
 //        echo $poll->getExpiresAt()->format('Y-m-d H:i:s');
         assertSame($date1->format('Y-m-d H:i:s'), $poll->getExpiresAt()->format('Y-m-d H:i:s'));
         $options = $poll->getOptions();
-        assertSame(2, count($options->getIds()));
-        assertSame($option1, $options->getText(1));
-        assertSame(2, $options->getVoteCount(1));
-        assertSame($option2, $options->getText(2));
-        assertSame(1, $options->getVoteCount(2));
+        assertSame(2, count($options));
+        assertSame($option1, $options[0]->getText());
+        assertSame(2, $options[0]->getVoteCount());
+        assertSame($option2, $options[1]->getText());
+        assertSame(1, $options[1]->getVoteCount());
         assertSame(3, $poll->getVoteCount());
     }