Resolved path problem for different locales (#21)

Author: fg

Http/Controllers/PublicController.php

@@ -28,7 +28,7 @@ public function __construct(PageRepository $page, Application $app)
      */
     public function uri($slug)
     {
-        $page = $this->page->findBySlug($slug);
+        $page = $this->page->findBySlugInLocale($slug, $this->locale);
 
         $this->throw404IfNotFound($page);
 

Repositories/Cache/CachePageDecorator.php

@@ -47,4 +47,20 @@ function () {
                 }
             );
     }
+
+    /**
+     * @param $slug
+     * @param $locale
+     * @return object
+     */
+    public function findBySlugInLocale($slug, $locale)
+    {
+        return $this->cache
+            ->tags($this->entityName, 'global')
+            ->remember("{$this->locale}.{$this->entityName}.findBySlugInLocale.{$slug}.{$locale}", $this->cacheTime,
+                function () use ($slug, $locale) {
+                    return $this->repository->findBySlugInLocale($slug, $locale);
+                }
+            );
+    }
 }

Repositories/Eloquent/EloquentPageRepository.php

@@ -1,5 +1,6 @@
 <?php namespace Modules\Page\Repositories\Eloquent;
 
+use Illuminate\Database\Eloquent\Builder;
 use Modules\Core\Repositories\Eloquent\EloquentBaseRepository;
 use Modules\Page\Events\PageWasCreated;
 use Modules\Page\Events\PageWasUpdated;
@@ -51,4 +52,21 @@ public function update($model, $data)
 
         return $model;
     }
+
+    /**
+     * @param $slug
+     * @param $locale
+     * @return object
+     */
+    public function findBySlugInLocale($slug, $locale)
+    {
+        if (method_exists($this->model, 'translations')) {
+            return $this->model->whereHas('translations', function (Builder $q) use ($slug, $locale) {
+                $q->where('slug', $slug);
+                $q->where('locale', $locale);
+            })->with('translations')->first();
+        }
+
+        return $this->model->where('slug', $slug)->where('locale', $locale)->first();
+    }
 }

Repositories/PageRepository.php

@@ -15,4 +15,11 @@ public function findHomepage();
      * @return int
      */
     public function countAll();
+
+    /**
+     * @param $slug
+     * @param $locale
+     * @return object
+     */
+    public function findBySlugInLocale($slug, $locale);
 }