Probable fix for multi theme handling per issue and language

sourcefabric · Jun 25, 2015 · d714d20 · d714d20
1 parent ad20e7c
commit d714d20
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 9 deletions.
diff --git a/newscoop/library/Newscoop/Entity/Repository/IssueRepository.php b/newscoop/library/Newscoop/Entity/Repository/IssueRepository.php
@@ -114,12 +114,16 @@ public function getIssue($languageCode, $publication, $shortName = null)
         return $qb->getQuery();
     }
 
-    public function getLastPublishedByPublication($publicationId)
+    public function getLastPublishedByPublicationAndLanguage($publicationId, $languageId)
     {
         $query = $this->createQueryBuilder('i')
-            ->select('i.id')
+            ->select('i')
             ->where('i.publication = :publicationId')
+            ->andWhere('i.workflowStatus = :publishStatus')
+            ->andWhere('i.language = :languageId')
             ->setParameter('publicationId', $publicationId)
+            ->setParameter('publishStatus', \Newscoop\Entity\Issue::STATUS_PUBLISHED)
+            ->setParameter('languageId', $languageId)
             ->setMaxResults(1)
             ->orderBy('i.id', 'DESC');
 

diff --git a/newscoop/library/Newscoop/Services/IssueService.php b/newscoop/library/Newscoop/Services/IssueService.php
@@ -136,43 +136,49 @@ public function issueResolver(Request $request)
             }
         }
 
+        // TODO: Check if we should add locale from request here
         return $this->getLatestPublishedIssue();
     }
 
     /**
      * {@inheritDoc}
      */
-    public function getLatestPublishedIssue()
+    public function getLatestPublishedIssue($language = null)
     {
         $publication = $this->publicationService->getPublication();
         if (!$publication) {
             return;
         }
 
+        if (!($language instanceof \Newscoop\Entity\Language)) {
+            $language = $publication->getDefaultLanguage();
+        }
+
         $publicationId = $publication->getId();
+        $languageId = $language->getId();
         $cacheKey = $this->cacheService->getCacheKey(array(
             'latest_published',
             $publicationId,
+            $languageId,
         ), 'issue');
 
         if ($this->cacheService->contains($cacheKey)) {
             $issue = $this->cacheService->fetch($cacheKey);
         } else {
             $issue = $this->em
                 ->getRepository('Newscoop\Entity\Issue')
-                ->getLastPublishedByPublication($publicationId)
-                ->getArrayResult();
+                ->getLastPublishedByPublicationAndLanguage($publicationId, $languageId)
+                ->getSingleResult();
 
             $this->cacheService->save($cacheKey, $issue);
         }
 
-        if (empty($issue)) {
+        if (!$issue) {
             return;
         }
 
-        $latestPublishedIssue = $this->em->getReference('Newscoop\Entity\Issue', $issue[0]['id']);
-        $this->setIssue($latestPublishedIssue);
+        $this->setIssue($issue);
 
-        return $latestPublishedIssue;
+        return $issue;
     }
 }