Remove not thrown errors catching (Cocolabs-SAS#324)

kraisel · Jan 18, 2019 · e856ed8 · e856ed8
1 parent b6023fd
commit e856ed8
Showing 1 changed file with 22 additions and 18 deletions.
diff --git a/src/Cocorico/CoreBundle/Repository/ListingRepository.php b/src/Cocorico/CoreBundle/Repository/ListingRepository.php
@@ -288,7 +288,7 @@ public function getFindOneByIdAndLocaleQuery($listingId, $locale)
      * Used by ElasticsearchBundle
      *
      * @param int $listingTranslationId
-     * @return array|null
+     * @return array
      */
     public function findByTranslationId($listingTranslationId)
     {
@@ -297,18 +297,30 @@ public function findByTranslationId($listingTranslationId)
             ->where('lt.id = :listingTranslationId')
             ->setParameter('listingTranslationId', $listingTranslationId);
 
-        try {
-            return $queryBuilder->getQuery()->getResult();
-        } catch (NoResultException $e) {
-            return null;
-        }
+        return $queryBuilder->getQuery()->getResult();
+    }
+
+    /**
+     * Used by ElasticsearchBundle
+     *
+     * @param int $listingListingCategoryId
+     * @return array
+     */
+    public function findByListingListingCategoryId($listingListingCategoryId)
+    {
+        $queryBuilder = $this->createQueryBuilder('l')
+            ->innerJoin('l.listingListingCategories', 'llc')
+            ->where('llc.id = :listingListingCategoryId')
+            ->setParameter('listingListingCategoryId', $listingListingCategoryId);
+
+        return $queryBuilder->getQuery()->getResult();
     }
 
     /**
      * Used by ElasticsearchBundle
      *
      * @param int $listingCategoryTranslationId
-     * @return array|null
+     * @return array
      */
     public function findByListingCategoryTranslationId($listingCategoryTranslationId)
     {
@@ -319,18 +331,14 @@ public function findByListingCategoryTranslationId($listingCategoryTranslationId
             ->where('lct.id = :listingCategoryTranslationId')
             ->setParameter('listingCategoryTranslationId', $listingCategoryTranslationId);
 
-        try {
-            return $queryBuilder->getQuery()->getResult();
-        } catch (NoResultException $e) {
-            return null;
-        }
+        return $queryBuilder->getQuery()->getResult();
     }
 
     /**
      * Used by ElasticsearchBundle
      *
      * @param int $userTranslationId
-     * @return array|null
+     * @return array
      */
     public function findByUserTranslationId($userTranslationId)
     {
@@ -340,10 +348,6 @@ public function findByUserTranslationId($userTranslationId)
             ->where('lut.id = :userTranslationId')
             ->setParameter('userTranslationId', $userTranslationId);
 
-        try {
-            return $queryBuilder->getQuery()->getResult();
-        } catch (NoResultException $e) {
-            return null;
-        }
+        return $queryBuilder->getQuery()->getResult();
     }
 }