renamed event to poll in the entire project (#695)

* renamed event to poll in the entire project
* Migration polls_event to polls_polls
* use timestamp

9 files changed, 89 insertions, 79 deletions

diff --git a/tests/Unit/Controller/PageControllerTest.php b/tests/Unit/Controller/PageControllerTest.php
index cbf14159..b915e0d8 100644
--- a/tests/Unit/Controller/PageControllerTest.php
+++ b/tests/Unit/Controller/PageControllerTest.php
@@ -77,7 +77,7 @@ class PageControllerTest extends UnitTestCase {
 		$optionMapper = $this->getMockBuilder('OCA\Polls\Db\OptionMapper')
 			->disableOriginalConstructor()
 			->getMock();
-		$eventMapper = $this->getMockBuilder('OCA\Polls\Db\EventMapper')
+		$pollMapper = $this->getMockBuilder('OCA\Polls\Db\PollMapper')
 			->disableOriginalConstructor()
 			->getMock();
 		$subscriptionMapper = $this->getMockBuilder('OCA\Polls\Db\SubscriptionMapper')
@@ -101,7 +101,7 @@ class PageControllerTest extends UnitTestCase {
 			$this->userId,
 			$commentMapper,
 			$optionMapper,
-			$eventMapper,
+			$pollMapper,
 			$subscriptionMapper,
 			$voteMapper,
 			$mailer
diff --git a/tests/Unit/Db/CommentMapperTest.php b/tests/Unit/Db/CommentMapperTest.php
index a66ca3fd..e78301a4 100644
--- a/tests/Unit/Db/CommentMapperTest.php
+++ b/tests/Unit/Db/CommentMapperTest.php
@@ -25,8 +25,8 @@ namespace OCA\Polls\Tests\Unit\Db;
 
 use OCA\Polls\Db\Comment;
 use OCA\Polls\Db\CommentMapper;
-use OCA\Polls\Db\Event;
-use OCA\Polls\Db\EventMapper;
+use OCA\Polls\Db\Poll;
+use OCA\Polls\Db\PollMapper;
 use OCA\Polls\Tests\Unit\UnitTestCase;
 use OCP\IDBConnection;
 use League\FactoryMuffin\Faker\Facade as Faker;
@@ -37,8 +37,8 @@ class CommentMapperTest extends UnitTestCase {
 	private $con;
 	/** @var CommentMapper */
 	private $commentMapper;
-	/** @var EventMapper */
-	private $eventMapper;
+	/** @var PollMapper */
+	private $pollMapper;
 
 	/**
 	 * {@inheritDoc}
@@ -47,7 +47,7 @@ class CommentMapperTest extends UnitTestCase {
 		parent::setUp();
 		$this->con = \OC::$server->getDatabaseConnection();
 		$this->commentMapper = new CommentMapper($this->con);
-		$this->eventMapper = new EventMapper($this->con);
+		$this->pollMapper = new PollMapper($this->con);
 	}
 
 	/**
@@ -56,13 +56,13 @@ class CommentMapperTest extends UnitTestCase {
 	 * @return Comment
 	 */
 	public function testCreate() {
-		/** @var Event $event */
-		$event = $this->fm->instance('OCA\Polls\Db\Event');
-		$this->assertInstanceOf(Event::class, $this->eventMapper->insert($event));
+		/** @var Poll $poll */
+		$poll = $this->fm->instance('OCA\Polls\Db\Poll');
+		$this->assertInstanceOf(Poll::class, $this->pollMapper->insert($poll));
 
 		/** @var Comment $comment */
 		$comment = $this->fm->instance('OCA\Polls\Db\Comment');
-		$comment->setPollId($event->getId());
+		$comment->setPollId($poll->getId());
 		$this->assertInstanceOf(Comment::class, $this->commentMapper->insert($comment));
 
 		return $comment;
@@ -90,8 +90,8 @@ class CommentMapperTest extends UnitTestCase {
 	 * @param Comment $comment
 	 */
 	public function testDelete(Comment $comment) {
-		$event = $this->eventMapper->find($comment->getPollId());
+		$poll = $this->pollMapper->find($comment->getPollId());
 		$this->commentMapper->delete($comment);
-		$this->eventMapper->delete($event);
+		$this->pollMapper->delete($poll);
 	}
 }
diff --git a/tests/Unit/Db/OptionMapperTest.php b/tests/Unit/Db/OptionMapperTest.php
index 73ec5752..67344c11 100644
--- a/tests/Unit/Db/OptionMapperTest.php
+++ b/tests/Unit/Db/OptionMapperTest.php
@@ -23,8 +23,8 @@
 
 namespace OCA\Polls\Tests\Unit\Db;
 
-use OCA\Polls\Db\Event;
-use OCA\Polls\Db\EventMapper;
+use OCA\Polls\Db\Poll;
+use OCA\Polls\Db\PollMapper;
 use OCA\Polls\Db\Option;
 use OCA\Polls\Db\OptionMapper;
 use OCA\Polls\Tests\Unit\UnitTestCase;
@@ -37,8 +37,8 @@ class OptionMapperTest extends UnitTestCase {
 	private $con;
 	/** @var OptionMapper */
 	private $optionMapper;
-	/** @var EventMapper */
-	private $eventMapper;
+	/** @var PollMapper */
+	private $pollMapper;
 
 	/**
 	 * {@inheritDoc}
@@ -47,7 +47,7 @@ class OptionMapperTest extends UnitTestCase {
 		parent::setUp();
 		$this->con = \OC::$server->getDatabaseConnection();
 		$this->optionMapper = new OptionMapper($this->con);
-		$this->eventMapper = new EventMapper($this->con);
+		$this->pollMapper = new PollMapper($this->con);
 	}
 
 	/**
@@ -56,13 +56,13 @@ class OptionMapperTest extends UnitTestCase {
 	 * @return Option
 	 */
 	public function testCreate() {
-		/** @var Event $event */
-		$event = $this->fm->instance('OCA\Polls\Db\Event');
-		$this->assertInstanceOf(Event::class, $this->eventMapper->insert($event));
+		/** @var Poll $poll */
+		$poll = $this->fm->instance('OCA\Polls\Db\Poll');
+		$this->assertInstanceOf(Poll::class, $this->pollMapper->insert($poll));
 
 		/** @var Option $option */
 		$option = $this->fm->instance('OCA\Polls\Db\Option');
-		$option->setPollId($event->getId());
+		$option->setPollId($poll->getId());
 		$this->assertInstanceOf(Option::class, $this->optionMapper->insert($option));
 
 		return $option;
@@ -90,8 +90,8 @@ class OptionMapperTest extends UnitTestCase {
 	 * @param Option $option
 	 */
 	public function testDelete(Option $option) {
-		$event = $this->eventMapper->find($option->getPollId());
+		$poll = $this->pollMapper->find($option->getPollId());
 		$this->optionMapper->delete($option);
-		$this->eventMapper->delete($event);
+		$this->pollMapper->delete($poll);
 	}
 }
diff --git a/tests/Unit/Db/EventMapperTest.php b/tests/Unit/Db/PollMapperTest.php
index e2a122fc..c91c80c9 100644
--- a/tests/Unit/Db/EventMapperTest.php
+++ b/tests/Unit/Db/PollMapperTest.php
@@ -23,18 +23,18 @@
 
 namespace OCA\Polls\Tests\Unit\Db;
 
-use OCA\Polls\Db\Event;
-use OCA\Polls\Db\EventMapper;
+use OCA\Polls\Db\Poll;
+use OCA\Polls\Db\PollMapper;
 use OCA\Polls\Tests\Unit\UnitTestCase;
 use OCP\IDBConnection;
 use League\FactoryMuffin\Faker\Facade as Faker;
 
-class EventMapperTest extends UnitTestCase {
+class PollMapperTest extends UnitTestCase {
 
 	/** @var IDBConnection */
 	private $con;
-	/** @var EventMapper */
-	private $eventMapper;
+	/** @var PollMapper */
+	private $pollMapper;
 
 	/**
 	 * {@inheritDoc}
@@ -42,46 +42,46 @@ class EventMapperTest extends UnitTestCase {
 	protected function setUp(): void {
 		parent::setUp();
 		$this->con = \OC::$server->getDatabaseConnection();
-		$this->eventMapper = new EventMapper($this->con);
+		$this->pollMapper = new PollMapper($this->con);
 	}
 
 	/**
 	 * Create some fake data and persist them to the database.
 	 *
-	 * @return Event
+	 * @return Poll
 	 */
 	public function testCreate() {
-		/** @var Event $event */
-		$event = $this->fm->instance('OCA\Polls\Db\Event');
-		$this->assertInstanceOf(Event::class, $this->eventMapper->insert($event));
+		/** @var Poll $poll */
+		$poll = $this->fm->instance('OCA\Polls\Db\Poll');
+		$this->assertInstanceOf(Poll::class, $this->pollMapper->insert($poll));
 
-		return $event;
+		return $poll;
 	}
 
 	/**
 	 * Update the previously created entry and persist the changes.
 	 *
 	 * @depends testCreate
-	 * @param Event $event
-	 * @return Event
+	 * @param Poll $poll
+	 * @return Poll
 	 */
-	public function testUpdate(Event $event) {
+	public function testUpdate(Poll $poll) {
 		$newTitle = Faker::sentence(10);
 		$newDescription = Faker::paragraph();
-		$event->setTitle($newTitle());
-		$event->setDescription($newDescription());
-		$this->eventMapper->update($event);
+		$poll->setTitle($newTitle());
+		$poll->setDescription($newDescription());
+		$this->pollMapper->update($poll);
 
-		return $event;
+		return $poll;
 	}
 
 	/**
 	 * Delete the previously created entry from the database.
 	 *
 	 * @depends testUpdate
-	 * @param Event $event
+	 * @param Poll $poll
 	 */
-	public function testDelete(Event $event) {
-		$this->eventMapper->delete($event);
+	public function testDelete(Poll $poll) {
+		$this->pollMapper->delete($poll);
 	}
 }
diff --git a/tests/Unit/Db/SubscriptionMapperTest.php b/tests/Unit/Db/SubscriptionMapperTest.php
index 4a2c64d2..3588ec94 100644
--- a/tests/Unit/Db/SubscriptionMapperTest.php
+++ b/tests/Unit/Db/SubscriptionMapperTest.php
@@ -23,8 +23,8 @@
 
 namespace OCA\Polls\Tests\Unit\Db;
 
-use OCA\Polls\Db\Event;
-use OCA\Polls\Db\EventMapper;
+use OCA\Polls\Db\Poll;
+use OCA\Polls\Db\PollMapper;
 use OCA\Polls\Db\Subscription;
 use OCA\Polls\Db\SubscriptionMapper;
 use OCA\Polls\Tests\Unit\UnitTestCase;
@@ -37,8 +37,8 @@ class SubscriptionMapperTest extends UnitTestCase {
 	private $con;
 	/** @var SubscriptionMapper */
 	private $subscriptionMapper;
-	/** @var EventMapper */
-	private $eventMapper;
+	/** @var PollMapper */
+	private $pollMapper;
 
 	/**
 	 * {@inheritDoc}
@@ -47,7 +47,7 @@ class SubscriptionMapperTest extends UnitTestCase {
 		parent::setUp();
 		$this->con = \OC::$server->getDatabaseConnection();
 		$this->subscriptionMapper = new SubscriptionMapper($this->con);
-		$this->eventMapper = new EventMapper($this->con);
+		$this->pollMapper = new PollMapper($this->con);
 	}
 
 	/**
@@ -56,13 +56,13 @@ class SubscriptionMapperTest extends UnitTestCase {
 	 * @return Subscription
 	 */
 	public function testCreate() {
-		/** @var Event $event */
-		$event = $this->fm->instance('OCA\Polls\Db\Event');
-		$this->assertInstanceOf(Event::class, $this->eventMapper->insert($event));
+		/** @var Poll $poll */
+		$poll = $this->fm->instance('OCA\Polls\Db\Poll');
+		$this->assertInstanceOf(Poll::class, $this->pollMapper->insert($poll));
 
 		/** @var Subscription $subscription */
 		$subscription = $this->fm->instance('OCA\Polls\Db\Subscription');
-		$subscription->setPollId($event->getId());
+		$subscription->setPollId($poll->getId());
 		$this->assertInstanceOf(Subscription::class, $this->subscriptionMapper->insert($subscription));
 
 		return $subscription;
@@ -90,8 +90,8 @@ class SubscriptionMapperTest extends UnitTestCase {
 	 * @param Subscription $subscription
 	 */
 	public function testDelete(Subscription $subscription) {
-		$event = $this->eventMapper->find($subscription->getPollId());
+		$poll = $this->pollMapper->find($subscription->getPollId());
 		$this->subscriptionMapper->delete($subscription);
-		$this->eventMapper->delete($event);
+		$this->pollMapper->delete($poll);
 	}
 }
diff --git a/tests/Unit/Db/VoteMapperTest.php b/tests/Unit/Db/VoteMapperTest.php
index 3a1c2f27..6904f11e 100644
--- a/tests/Unit/Db/VoteMapperTest.php
+++ b/tests/Unit/Db/VoteMapperTest.php
@@ -23,8 +23,8 @@
 
 namespace OCA\Polls\Tests\Unit\Db;
 
-use OCA\Polls\Db\Event;
-use OCA\Polls\Db\EventMapper;
+use OCA\Polls\Db\Poll;
+use OCA\Polls\Db\PollMapper;
 use OCA\Polls\Db\Vote;
 use OCA\Polls\Db\VoteMapper;
 use OCA\Polls\Tests\Unit\UnitTestCase;
@@ -37,8 +37,8 @@ class VoteMapperTest extends UnitTestCase {
 	private $con;
 	/** @var VoteMapper */
 	private $voteMapper;
-	/** @var EventMapper */
-	private $eventMapper;
+	/** @var PollMapper */
+	private $pollMapper;
 
 	/**
 	 * {@inheritDoc}
@@ -47,7 +47,7 @@ class VoteMapperTest extends UnitTestCase {
 		parent::setUp();
 		$this->con = \OC::$server->getDatabaseConnection();
 		$this->voteMapper = new VoteMapper($this->con);
-		$this->eventMapper = new EventMapper($this->con);
+		$this->pollMapper = new PollMapper($this->con);
 	}
 
 	/**
@@ -56,14 +56,14 @@ class VoteMapperTest extends UnitTestCase {
 	 * @return Vote
 	 */
 	public function testCreate() {
-		/** @var Event $event */
-		$event = $this->fm->instance('OCA\Polls\Db\Event');
-		$this->assertInstanceOf(Event::class, $this->eventMapper->insert($event));
+		/** @var Poll $poll */
+		$poll = $this->fm->instance('OCA\Polls\Db\Poll');
+		$this->assertInstanceOf(Poll::class, $this->pollMapper->insert($poll));
 
 
 		/** @var Vote $vote */
 		$vote = $this->fm->instance('OCA\Polls\Db\Vote');
-		$vote->setPollId($event->getId());
+		$vote->setPollId($poll->getId());
 		$vote->setVoteOptionId(1);
 		$this->assertInstanceOf(Vote::class, $this->voteMapper->insert($vote));
 
@@ -92,8 +92,8 @@ class VoteMapperTest extends UnitTestCase {
 	 * @param Vote $vote
 	 */
 	public function testDelete(Vote $vote) {
-		$event = $this->eventMapper->find($vote->getPollId());
+		$poll = $this->pollMapper->find($vote->getPollId());
 		$this->voteMapper->delete($vote);
-		$this->eventMapper->delete($event);
+		$this->pollMapper->delete($poll);
 	}
 }
diff --git a/tests/Unit/Factories/CommentFactory.php b/tests/Unit/Factories/CommentFactory.php
index 02dc6d5d..dcd4077a 100644
--- a/tests/Unit/Factories/CommentFactory.php
+++ b/tests/Unit/Factories/CommentFactory.php
@@ -32,5 +32,9 @@ $fm->define('OCA\Polls\Db\Comment')->setDefinitions([
 		$date = new DateTime('today');
 		return $date->format('Y-m-d H:i:s');
 	},
+	'timestamp' => function() {
+		$date = new DateTime('today');
+		return $date->getTimestamp();
+	},
 	'comment' => Faker::text(255)
 ]);
diff --git a/tests/Unit/Factories/OptionFactory.php b/tests/Unit/Factories/OptionFactory.php
index 872b2d0e..e714d67c 100644
--- a/tests/Unit/Factories/OptionFactory.php
+++ b/tests/Unit/Factories/OptionFactory.php
@@ -27,5 +27,6 @@ use League\FactoryMuffin\Faker\Facade as Faker;
  * General factory for the text model.
  */
 $fm->define('OCA\Polls\Db\Option')->setDefinitions([
-	'pollOptionText' => Faker::text(255)
+	'pollOptionText' => Faker::text(255),
+	'timestamp' => 0
 ]);
diff --git a/tests/Unit/Factories/EventFactory.php b/tests/Unit/Factories/PollFactory.php
index db94ab70..b811cc15 100644
--- a/tests/Unit/Factories/EventFactory.php
+++ b/tests/Unit/Factories/PollFactory.php
@@ -24,27 +24,32 @@
 use League\FactoryMuffin\Faker\Facade as Faker;
 
 /**
- * General factory for the event model.
+ * General factory for the poll model.
  */
-$fm->define('OCA\Polls\Db\Event')->setDefinitions([
-	'type' => 0,
+$fm->define('OCA\Polls\Db\Poll')->setDefinitions([
+	'type' => 'textPoll',
 	'title' => Faker::sentence(10),
 	'description' => Faker::text(255),
 	'owner' => Faker::firstNameMale(),
 	'created' => function() {
 		$date = new DateTime('today');
-		return $date->format('Y-m-d H:i:s');
+		return $date->getTimestamp();
 	},
-	'access' => 'registered',
 	'expire' => function() {
 		$date = new DateTime('tomorrow');
-		return $date->format('Y-m-d H:i:s');
+		return $date->getTimestamp();
 	},
-	'isAnonymous' => 0,
-	'fullAnonymous' => 0,
-	'showResults' => 'always',
-	'delete_date' => function() {
+	'deleted' => function() {
 		$date = new DateTime('+1 month');
-		return $date->format('Y-m-d H:i:s');
+		return $date->getTimestamp();
 	},
+	'access' => 'public',
+	'anonymous' => 0,
+	'fullAnonymous' => 0,
+	'allowMaybe' => 1,
+	'options' => '["yes","no","maybe"]',
+	'settings' => '{"someJSON":0}',
+	'voteLimit' => 0,
+	'showResults' => 'always',
+	'adminAccess' => 0
 ]);