code styles

added download delete method added new secret question creation
kokspflanze · Aug 31, 2015 · 6c5275b · 6c5275b
1 parent 5eb3550
commit 6c5275b
Show file tree

Hide file tree

Showing 6 changed files with 115 additions and 20 deletions.
diff --git a/src/PServerCMS/Entity/Repository/DownloadList.php b/src/PServerCMS/Entity/Repository/DownloadList.php
@@ -50,4 +50,19 @@ public function getDownload4Id( $id )
 
 		return $query->getOneOrNullResult();
 	}
+
+	/**
+	 * @param $downloadId
+	 * @return mixed
+	 */
+	public function deleteDownloadEntry($downloadId)
+	{
+		$query = $this->createQueryBuilder('p')
+			->delete($this->getEntityName(), 'p')
+			->where('p.id = :id')
+			->setParameter('id', $downloadId)
+			->getQuery();
+
+		return $query->execute();
+	}
 }
diff --git a/src/PServerCMS/Entity/Repository/SecretQuestion.php b/src/PServerCMS/Entity/Repository/SecretQuestion.php
@@ -37,4 +37,13 @@ public function getQuestion4Id( $id )
 
         return $query->getOneOrNullResult();
     }
+
+    /**
+     * @return \Doctrine\ORM\QueryBuilder
+     */
+    public function getQuestionQueryBuilder()
+    {
+        return $this->createQueryBuilder( 'p' )
+            ->select( 'p' );
+    }
 } 
diff --git a/src/PServerCMS/Entity/Repository/UserCodes.php b/src/PServerCMS/Entity/Repository/UserCodes.php
@@ -40,7 +40,7 @@ public function getData4CodeType($code, $type)
 	public function deleteCodes4User($userId, $type)
     {
 		$query = $this->createQueryBuilder('p')
-			->delete('PServerCMS\Entity\UserCodes','p')
+			->delete($this->getEntityName(), 'p')
 			->where('p.user = :user_id')
 			->setParameter('user_id', $userId)
 			->andWhere('p.type = :type')
@@ -57,7 +57,7 @@ public function deleteCodes4User($userId, $type)
      */
     public function getCode( $code )
     {
-        return $this->findOneBy(array('code' => $code));
+        return $this->findOneBy(['code' => $code]);
     }
 
     /**

diff --git a/src/PServerCMS/Helper/HelperForm.php b/src/PServerCMS/Helper/HelperForm.php
@@ -55,6 +55,14 @@ public function getAdminUserBlockForm()
         return $this->getService('pserver_admin_user_block_form');
     }
 
+    /**
+     * @return \PServerAdmin\Form\SecretQuestion
+     */
+    public function getAdminSecretQuestionForm()
+    {
+        return $this->getService('pserver_admin_secret_question_form');
+    }
+
     /**
      * @return \PServerAdmin\Form\UserRole
      */

diff --git a/src/PServerCMS/Service/Download.php b/src/PServerCMS/Service/Download.php
@@ -14,9 +14,7 @@ class Download extends InvokableBase
 	public function getActiveList()
     {
 		$downloadInfo = $this->getCachingHelperService()->getItem(Caching::DOWNLOAD, function() {
-			/** @var \PServerCMS\Entity\Repository\DownloadList $repository */
-			$repository = $this->getEntityManager()->getRepository($this->getEntityOptions()->getDownloadList());
-			return $repository->getActiveDownloadList();
+			return $this->getDownloadRepository()->getActiveDownloadList();
 		});
 
 		return $downloadInfo;
@@ -27,9 +25,7 @@ public function getActiveList()
 	 */
 	public function getDownloadList()
     {
-		/** @var \PServerCMS\Entity\Repository\DownloadList $repository */
-		$repository = $this->getEntityManager()->getRepository($this->getEntityOptions()->getDownloadList());
-		return $repository->getDownloadList();
+		return $this->getDownloadRepository()->getDownloadList();
 	}
 
     /**
@@ -38,28 +34,28 @@ public function getDownloadList()
      */
 	public function getDownload4Id( $id )
     {
-		/** @var \PServerCMS\Entity\Repository\DownloadList $repository */
-		$repository = $this->getEntityManager()->getRepository($this->getEntityOptions()->getDownloadList());
-		return $repository->getDownload4Id($id);
+		return $this->getDownloadRepository()->getDownload4Id($id);
 	}
 
 	/**
 	 * @param array $data
-	 * @param null  $currentDownload
+	 * @param null|DownloadList $currentDownload
 	 *
 	 * @return bool|DownloadList
 	 */
 	public function download( array $data, $currentDownload = null)
     {
-		if($currentDownload == null){
-			$currentDownload = new DownloadList();
+		if ($currentDownload == null) {
+			$class = $this->getEntityOptions()->getDownloadList();
+			/** @var DownloadList $currentDownload */
+			$currentDownload = new $class;
 		}
 
 		$form = $this->getAdminDownloadForm();
 		$form->setData($data);
 		$form->setHydrator(new HydratorDownload());
 		$form->bind($currentDownload);
-		if(!$form->isValid()){
+		if (!$form->isValid()) {
 			return false;
 		}
 
@@ -72,4 +68,22 @@ public function download( array $data, $currentDownload = null)
 
 		return $download;
 	}
+
+	/**
+	 * @param DownloadList $downloadEntry
+	 * @return mixed
+	 */
+	public function deleteDownloadEntry(DownloadList $downloadEntry)
+	{
+		return $this->getDownloadRepository()->deleteDownloadEntry($downloadEntry->getId());
+	}
+
+	/**
+	 * @return \PServerCMS\Entity\Repository\DownloadList
+	 */
+	protected function getDownloadRepository()
+	{
+		return $this->getEntityManager()->getRepository($this->getEntityOptions()->getDownloadList());;
+	}
+
 } 
diff --git a/src/PServerCMS/Service/SecretQuestion.php b/src/PServerCMS/Service/SecretQuestion.php
@@ -2,7 +2,9 @@
 
 namespace PServerCMS\Service;
 
+use PServerAdmin\Mapper\HydratorSecretQuestion;
 use PServerCMS\Entity\UserInterface;
+use PServerCMS\Entity\SecretQuestion as Entity;
 
 class SecretQuestion extends InvokableBase
 {
@@ -19,6 +21,7 @@ public function setSecretAnswer( UserInterface $user, $questionId, $answer )
 		$class = $this->getEntityOptions()->getSecretAnswer();
 		/** @var \PServerCMS\Entity\SecretAnswer $secretAnswer */
 		$secretAnswer = new $class;
+
 		$secretAnswer->setUser($user)
 			->setAnswer(trim($answer))
 			->setQuestion( $this->getQuestion4Id($questionId) );
@@ -43,7 +46,48 @@ public function isAnswerAllowed( UserInterface $user, $answer )
 		$realAnswer = strtolower(trim($answerEntity->getAnswer()));
 		$plainAnswer = strtolower(trim($answer));
 
-		return $realAnswer == $plainAnswer;
+		return $realAnswer === $plainAnswer;
+	}
+
+	/**
+	 * @return \Doctrine\ORM\QueryBuilder
+	 */
+	public function getQuestionQueryBuilder()
+	{
+		return $this->getQuestionRepository()->getQuestionQueryBuilder();
+	}
+
+
+	/**
+	 * @param array $data
+	 * @param null|Entity $currentSecretQuestion
+	 *
+	 * @return bool|Entity
+	 */
+	public function secretQuestion(array $data, $currentSecretQuestion = null)
+	{
+		if ($currentSecretQuestion == null) {
+			$class = $this->getEntityOptions()->getSecretQuestion();
+			/** @var Entity $currentSecretQuestion */
+			$currentSecretQuestion = new $class;
+		}
+
+		$form = $this->getAdminSecretQuestionForm();
+		$form->setData($data);
+		$form->setHydrator(new HydratorSecretQuestion());
+		$form->bind($currentSecretQuestion);
+		if (!$form->isValid()) {
+			return false;
+		}
+
+		/** @var Entity $secretQuestion */
+		$secretQuestion = $form->getData();
+
+		$entity = $this->getEntityManager();
+		$entity->persist($secretQuestion);
+		$entity->flush();
+
+		return $secretQuestion;
 	}
 
 	/**
@@ -53,10 +97,7 @@ public function isAnswerAllowed( UserInterface $user, $answer )
 	 */
 	protected function getQuestion4Id( $questionId )
     {
-        /** @var \PServerCMS\Entity\Repository\SecretQuestion $repository */
-		$repository = $this->getEntityManager()->getRepository($this->getEntityOptions()->getSecretQuestion());
-
-		return $repository->getQuestion4Id( $questionId );
+		return $this->getQuestionRepository()->getQuestion4Id( $questionId );
 	}
 
 	/**
@@ -67,4 +108,12 @@ protected function getEntityManagerAnswer()
 		return $this->getEntityManager()->getRepository($this->getEntityOptions()->getSecretAnswer());
 	}
 
+	/**
+	 * @return \PServerCMS\Entity\Repository\SecretQuestion $repository
+	 */
+	protected function getQuestionRepository()
+	{
+		return $this->getEntityManager()->getRepository($this->getEntityOptions()->getSecretQuestion());
+	}
+
 }