fix tests and poll cloning

Signed-off-by: dartcafe <github@dartcafe.de>

Author: dartcafe

lib/Db/Poll.php

@@ -220,6 +220,39 @@ public function __clone() {
 		$this->setAnonymous(0);
 	}
 
+	/**
+	 * Build a fresh Poll entity pre-populated from this poll's settings.
+	 * The fresh entity's id is never set, so QBMapper::insert() relies on the
+	 * DB autoincrement to assign a fresh id.
+	 */
+	public function createClone(string $newOwner): self {
+		$clone = new self();
+		$clone->setType($this->getType());
+		$clone->setVotingVariant($this->getVotingVariant());
+		$clone->setTitle('Clone of ' . $this->getTitle());
+		$clone->setDescription($this->getDescription());
+		$clone->setOwner($newOwner);
+		$clone->setCreated(time());
+		$clone->setLastInteraction(0);
+		$clone->setExpire($this->getExpire());
+		$clone->setDeleted(0);
+		$clone->setAccess(self::ACCESS_PRIVATE);
+		$clone->setAnonymous(0);
+		$clone->setAllowComment($this->getAllowComment());
+		$clone->setAllowMaybe($this->getAllowMaybe());
+		$clone->setAllowProposals($this->getAllowProposals());
+		$clone->setProposalsExpire($this->getProposalsExpire());
+		$clone->setVoteLimit($this->getVoteLimit());
+		$clone->setOptionLimit($this->getOptionLimit());
+		$clone->setShowResults($this->getShowResults());
+		$clone->setAdminAccess($this->getAdminAccess());
+		$clone->setHideBookedUp($this->getHideBookedUp());
+		$clone->setUseNo($this->getUseNo());
+		$clone->setMiscSettings($this->getMiscSettings());
+		$clone->setTimezoneName($this->getTimezoneName());
+		return $clone;
+	}
+
 	/**
 	 * @return array
 	 *

lib/Service/PollService.php

@@ -411,9 +411,7 @@ public function clone(int $pollId): Poll {
 			throw new ForbiddenException('Poll creation is disabled');
 		}
 
-		$this->poll = clone $origin;
-
-		$this->poll->setOwner($this->userSession->getCurrentUserId());
+		$this->poll = $origin->createClone($this->userSession->getCurrentUserId());
 
 		$this->poll = $this->pollMapper->insert($this->poll);
 		$this->eventDispatcher->dispatchTyped(new PollCreatedEvent($this->poll));

tests/Unit/Service/OptionServiceTest.php

@@ -9,7 +9,6 @@
 namespace OCA\Polls\Tests\Unit\Service;
 
 use OCA\Polls\Db\Option;
-use OCA\Polls\Db\OptionMapper;
 use OCA\Polls\Db\Poll;
 use OCA\Polls\Db\PollMapper;
 use OCA\Polls\Exceptions\InsufficientAttributesException;
@@ -21,7 +20,6 @@
 
 class OptionServiceTest extends UnitTestCase {
 	private OptionService $optionService;
-	private OptionMapper $optionMapper;
 	private PollMapper $pollMapper;
 	private ISession $session;
 
@@ -35,7 +33,6 @@ protected function setUp(): void {
 		$this->session->set('ncPollsUserId', 'admin');
 
 		$this->optionService = Server::get(OptionService::class);
-		$this->optionMapper = Server::get(OptionMapper::class);
 		$this->pollMapper = Server::get(PollMapper::class);
 
 		// Text poll owned by admin, private, open
@@ -66,11 +63,11 @@ protected function tearDown(): void {
 		// Options are deleted when their poll is deleted
 		try {
 			$this->pollMapper->delete($this->textPoll);
-		} catch (\Exception $e) {
+		} catch (\Exception) {
 		}
 		try {
 			$this->pollMapper->delete($this->datePoll);
-		} catch (\Exception $e) {
+		} catch (\Exception) {
 		}
 	}
 
@@ -163,6 +160,10 @@ public function testConfirmOptionOnExpiredPoll(): void {
 		$this->textPoll->setExpire(time() - 3600);
 		$this->pollMapper->update($this->textPoll);
 
+		// Bust OptionService poll cache: load datePoll so the next call for textPoll
+		// causes a cache miss and re-reads the updated expire from DB
+		$this->optionService->list($this->datePoll->getId());
+
 		$confirmed = $this->optionService->confirm($this->textOption->getId());
 		$this->assertGreaterThan(0, $confirmed->getConfirmed());
 
@@ -175,6 +176,9 @@ public function testConfirmTogglesConfirmation(): void {
 		$this->textPoll->setExpire(time() - 3600);
 		$this->pollMapper->update($this->textPoll);
 
+		// Bust OptionService poll cache so updated expire is read from DB
+		$this->optionService->list($this->datePoll->getId());
+
 		$this->optionService->confirm($this->textOption->getId()); // confirm
 		$unconfirmed = $this->optionService->confirm($this->textOption->getId()); // toggle back
 		$this->assertSame(0, $unconfirmed->getConfirmed());

tests/Unit/Service/VoteServiceTest.php

@@ -9,13 +9,14 @@
 namespace OCA\Polls\Tests\Unit\Service;
 
 use OCA\Polls\Db\Option;
-use OCA\Polls\Db\OptionMapper;
 use OCA\Polls\Db\Poll;
 use OCA\Polls\Db\PollMapper;
 use OCA\Polls\Db\Share;
 use OCA\Polls\Db\ShareMapper;
 use OCA\Polls\Db\Vote;
 use OCA\Polls\Db\VoteMapper;
+use OCA\Polls\Model\SimpleOption;
+use OCA\Polls\Service\OptionService;
 use OCA\Polls\Service\VoteService;
 use OCA\Polls\Tests\Unit\UnitTestCase;
 use OCA\Polls\UserSession;
@@ -24,8 +25,8 @@
 
 class VoteServiceTest extends UnitTestCase {
 	private VoteService $voteService;
+	private OptionService $optionService;
 	private PollMapper $pollMapper;
-	private OptionMapper $optionMapper;
 	private ShareMapper $shareMapper;
 	private VoteMapper $voteMapper;
 	private ISession $session;
@@ -42,10 +43,10 @@ protected function setUp(): void {
 		parent::setUp();
 		$this->session = Server::get(ISession::class);
 		$this->pollMapper = Server::get(PollMapper::class);
-		$this->optionMapper = Server::get(OptionMapper::class);
 		$this->shareMapper = Server::get(ShareMapper::class);
 		$this->voteMapper = Server::get(VoteMapper::class);
 		$this->voteService = Server::get(VoteService::class);
+		$this->optionService = Server::get(OptionService::class);
 		$this->userSession = Server::get(UserSession::class);
 
 		// Poll owned by admin, private access, voting open (useNo=0 is default)
@@ -55,12 +56,6 @@ protected function setUp(): void {
 		$poll->setExpire(0);
 		$this->poll = $this->pollMapper->insert($poll);
 
-		// Option belonging to the poll
-		$option = $this->fm->instance('OCA\Polls\Db\Option');
-		$option->setPollId($this->poll->getId());
-		$option->setOwner('admin');
-		$this->option = $this->optionMapper->insert($option);
-
 		// TYPE_USER share for admin — gives getCurrentUser() a User object (TYPE_USER)
 		$ownerShare = $this->fm->instance('OCA\Polls\Db\Share');
 		$ownerShare->setPollId($this->poll->getId());
@@ -75,7 +70,16 @@ protected function setUp(): void {
 		$externalShare->setUserId(self::EXTERNAL_USER_ID);
 		$this->externalShare = $this->shareMapper->insert($externalShare);
 
+		// Login before creating option so OptionService can check permissions
 		$this->loginAsOwner();
+
+		// Option created via service so pollOptionHash is computed and stored in DB
+		// (factory-created options bypass setPoll() and lack the hash, causing VoteMapper
+		// join failures)
+		$this->option = $this->optionService->add(
+			$this->poll->getId(),
+			(new SimpleOption())->setText('Test option')
+		);
 	}
 
 	protected function tearDown(): void {