*/
public function addEntryFormAction(Request $request)
{
- $em = $this->getDoctrine()->getManager();
$entry = new Entry($this->getUser());
$form = $this->createForm(new NewEntryType(), $entry);
$form->handleRequest($request);
if ($form->isValid()) {
- $existingEntry = $em
- ->getRepository('WallabagCoreBundle:Entry')
- ->findOneByUrlAndUserId($entry->getUrl(), $this->getUser()->getId());
+ // check for existing entry, if it exists, redirect to it with a message
+ $existingEntry = $this->get('wallabag_core.entry_repository')
+ ->existByUrlAndUserId($entry->getUrl(), $this->getUser()->getId());
- if (count($existingEntry) > 0) {
+ if (false !== $existingEntry) {
$this->get('session')->getFlashBag()->add(
'notice',
- 'Entry already saved on '.$existingEntry[0]->getCreatedAt()->format('d-m-Y')
+ 'Entry already saved on '.$existingEntry['createdAt']->format('d-m-Y')
);
- return $this->redirect($this->generateUrl('view', array('id' => $existingEntry[0]->getId())));
+ return $this->redirect($this->generateUrl('view', array('id' => $existingEntry['id'])));
}
$this->updateEntry($entry);
/**
* Find an entry by its url and its owner.
+ * If it exists, return the entry otherwise return false.
*
* @param $url
* @param $userId
*
- * @return array
+ * @return array|bool
*/
- public function findOneByUrlAndUserId($url, $userId)
+ public function existByUrlAndUserId($url, $userId)
{
- return $this->createQueryBuilder('e')
+ $res = $this->createQueryBuilder('e')
+ ->select('e.id, e.createdAt')
->where('e.url = :url')->setParameter('url', $url)
->andWhere('e.user = :user_id')->setParameter('user_id', $userId)
->getQuery()
->getResult();
+
+ if (count($res) > 1) {
+ return next($res);
+ }
+
+ return false;
}
}
- @wallabag_core.tag_repository
- @wallabag_core.entry_repository
+ # repository as a service
wallabag_core.entry_repository:
class: Wallabag\CoreBundle\Repository\EntryRepository
factory: [ @doctrine.orm.default_entity_manager, getRepository ]
$existingEntry = $this->em
->getRepository('WallabagCoreBundle:Entry')
- ->findOneByUrlAndUserId($url, $this->user->getId());
+ ->existByUrlAndUserId($url, $this->user->getId());
- if (count($existingEntry) > 0) {
+ if (false !== $existingEntry) {
++$this->skippedEntries;
continue;
}