Merge branch 'develop' into develop-IFRC

Author: Jose Ganora

app/Classes/Feeds/WhatNowFeed.php

@@ -9,6 +9,7 @@
 use App\Classes\Serializers\CustomDataSerializer;
 use App\Classes\Transformers\WhatNowEntityTransformer;
 use App\Models\Organisation;
+use App\Models\Region;
 use App\Models\WhatNowEntity;
 
 class WhatNowFeed implements JsonFeedInterface
@@ -18,6 +19,11 @@ class WhatNowFeed implements JsonFeedInterface
 	 */
 	protected $language;
 
+	/**
+	 * @var Region
+	 */
+	protected $region;
+
 	/**
 	 * @var Organisation
 	 */
@@ -85,14 +91,23 @@ public function setOrganisation(Organisation $org)
 	}
 
 	/**
-	 * @param string $lang
+	 * @param null $region
 	 * @return $this
 	 */
-	public function setLanguage($lang = 'en_US')
+	public function setRegion(Region $region = null)
 	{
-		// @todo validate locale
-		$this->language = $lang;
+		$this->region = $region;
+		return $this;
+	}
 
+	/**
+	 * @param string $lang
+	 * @return $this
+	 */
+	public function setLanguage($lang = null)
+	{
+		$this->language = $lang ? substr($lang, 0, 2) : null;
+		$this->transformer->setLang($this->language);
 		return $this;
 	}
 
@@ -118,7 +133,8 @@ public function loadData()
 		$data = $this->whatNowRepo->findItemsForOrgId(
 			$this->organisation->id,
 			$this->language,
-			$this->filterEventTypes
+			$this->filterEventTypes,
+			$this->region->id ?? null
 		);
 
 		if ($data instanceof Collection) {

app/Classes/Repositories/RegionRepository.php

@@ -1,9 +1,40 @@
 <?php
-
 namespace App\Classes\Repositories;
 
+use App\Models\Region;
+
+
 class RegionRepository implements RegionRepositoryInterface
 {
+    /**
+     * @var Region
+     */
+    protected $regModel;
+
+    /**
+     * @param Region $regionModel
+     */
+    public function __construct(Region $regModel)
+    {
+        $this->regModel = $regModel;
+    }
+
+    /**
+     * @param array $attributes
+     * @return static
+     */
+    public function newInstance(array $attributes = [])
+    {
+        return $this->regModel->newInstance($attributes);
+    }
+
+
+    public function findBySlug($orgId, $slug)
+    {
+        $slug = strtolower($slug);
+        $slug = str_replace(' ', '-', $slug);
+        return $this->regModel->where('slug', $slug)->where('organisation_id', $orgId)->first();
+    }
 
     public function mapTranslationInput($regionId, $language_code, $data)
     {

app/Classes/Repositories/RegionRepositoryInterface.php

@@ -4,5 +4,10 @@
 
 interface RegionRepositoryInterface
 {
+    /**
+	 * @param $regionName
+	 * @return mixed
+	 */
+	public function findBySlug($orgId, $slug);
 
 }

app/Classes/Repositories/WhatNowRepository.php

@@ -148,14 +148,18 @@ public function destroy($id)
      * @param null $lang
      * @param array $eventTypes
      */
-    public function findItemsForOrgId($orgId, $lang = null, array $eventTypes = [])
+    public function findItemsForOrgId($orgId, $lang = null, array $eventTypes = [], $regId = null)
     {
         $query = $this->whatNowModel->where('org_id', $orgId);
 
         if (count($eventTypes)) {
             $query->whereIn('event_type', $eventTypes);
         }
 
+        if ($regId) {
+            $query->where('region_id', $regId);
+        }
+
         return $query->get();
     }
 

app/Classes/Repositories/WhatNowRepositoryInterface.php

@@ -9,7 +9,7 @@ interface WhatNowRepositoryInterface extends RepositoryInterface
      * @param null $lang
      * @param array $eventTypes
      */
-    public function findItemsForOrgId($orgId, $lang = null, array $eventTypes = []);
+    public function findItemsForOrgId($orgId, $lang = null, array $eventTypes = [], $regionName = null);
 
     /**
      * @param $orgId

app/Classes/Repositories/WhatNowTranslationRepository.php

@@ -132,14 +132,23 @@ public function getLatestTranslations($id)
      * @param $id
      * @return \Illuminate\Database\Eloquent\Collection
      */
-    public function getLatestPublishedTranslations($id)
+    public function getLatestPublishedTranslations($id, $lang = null)
     {
         $model = $this->whatNowTranslationModel;
 
-        return $model::fromQuery(DB::raw('SELECT wet1.*
-FROM whatnow_entity_translations wet1
-LEFT JOIN whatnow_entity_translations wet2 ON wet1.entity_id = wet2.entity_id AND wet1.language_code = wet2.language_code AND wet1.published_at < wet2.published_at
-WHERE wet2.published_at IS NULL AND wet1.entity_id = :entityId AND wet1.published_at IS NOT NULL'), ['entityId' => $id]);
+        $query = 'SELECT wet1.*
+              FROM whatnow_entity_translations wet1
+              LEFT JOIN whatnow_entity_translations wet2 ON wet1.entity_id = wet2.entity_id AND wet1.language_code = wet2.language_code AND wet1.published_at < wet2.published_at
+              WHERE wet2.published_at IS NULL AND wet1.entity_id = :entityId AND wet1.published_at IS NOT NULL';
+        
+        $bindings = ['entityId' => $id];
+
+        if ($lang !== null) {
+            $query .= ' AND wet1.language_code = :lang';
+            $bindings['lang'] = $lang;
+        }
+
+        return $model::fromQuery(DB::raw($query), $bindings);
     }
 
     /**

app/Classes/Repositories/WhatNowTranslationRepositoryInterface.php

@@ -23,7 +23,7 @@ public function getLatestTranslations($id);
 	 * @param $id
 	 * @return \Illuminate\Database\Eloquent\Collection
 	 */
-	public function getLatestPublishedTranslations($id);
+	public function getLatestPublishedTranslations($id, $lang = null);
 
 	/**
 	 * @param array $ids

app/Classes/Transformers/WhatNowEntityTransformer.php

@@ -14,6 +14,7 @@ class WhatNowEntityTransformer extends TransformerAbstract
 	 * @var bool
 	 */
 	private $unpublished = false;
+	private $lang = null;
 
 	/**
 	 * @var bool
@@ -37,9 +38,18 @@ function __construct(WhatNowTranslationRepositoryInterface $repo, $configuration
             $this->castDateToBoolean = $configuration['castDateToBoolean'];
         }
 
+		if(isset($configuration['lang'])) {
+			$this->lang = $configuration['lang'];
+		}
+
 		$this->wnTransRepo = $repo;
 	}
 
+	public function setLang($lang)
+	{
+		$this->lang = $lang;
+	}
+
 	/**
 	 * Turn this item object into a generic array
 	 *
@@ -80,7 +90,7 @@ public function transform(WhatNowEntity $model)
 		if ($this->unpublished) {
 			$translations = $this->wnTransRepo->getLatestTranslations($model->id);
 		} else {
-			$translations = $this->wnTransRepo->getLatestPublishedTranslations($model->id);
+			$translations = $this->wnTransRepo->getLatestPublishedTranslations($model->id, $this->lang);
 		}
 
 		$defaultStages = [];

app/Http/Controllers/WhatNowController.php

@@ -4,6 +4,7 @@
 
 use App\Classes\Feeds\WhatNowFeed;
 use App\Classes\Repositories\OrganisationRepositoryInterface;
+use App\Classes\Repositories\RegionRepositoryInterface;
 use App\Classes\Repositories\WhatNowRepositoryInterface;
 use App\Classes\Repositories\WhatNowTranslationRepositoryInterface;
 use App\Classes\Serializers\CustomDataSerializer;
@@ -27,6 +28,11 @@ class WhatNowController extends Controller
      */
     protected $orgRepo;
 
+    /**
+     * @var RegionRepositoryInterface
+     */
+    protected $regionRepo;
+
     /**
      * @var WhatNowRepositoryInterface
      */
@@ -58,12 +64,14 @@ class WhatNowController extends Controller
      */
     public function __construct(
         OrganisationRepositoryInterface $orgRepo,
+        RegionRepositoryInterface $regionRepo,
         WhatNowRepositoryInterface $wnRepo,
         WhatNowTranslationRepositoryInterface $wnTransRepo,
         Request $request,
         Manager $manager
     ) {
         $this->orgRepo = $orgRepo;
+        $this->regionRepo = $regionRepo;
         $this->wnRepo = $wnRepo;
         $this->wnTransRepo = $wnTransRepo;
         $this->request = $request;
@@ -177,18 +185,26 @@ public function getFeed(WhatNowFeed $feed, $code)
 
             return response(null, 404);
         }
-
         $feed->setOrganisation($org);
 
-        // @todo lang filter
-        /*$langParam = $this->request->query('language', null);
+        $regName = $this->request->query('region', null);
+        if ($regName) {
+            try {
+                $reg = $this->regionRepo->findBySlug($org->id, $regName);
+                $feed->setRegion($reg);
+            } catch (\Exception $e) {
+                Log::error('Region not found', ['message' => $e->getMessage()]);
+            }
+        }
+
+        $langParam = $this->request->query('language', null);
         $langHeader = $this->request->header('Accept-Language', null);
 
         if ($langParam) {
-            $feed->setLanguage($this->request->query('language'));
+            $feed->setLanguage($langParam);
         } elseif ($langHeader) {
             $feed->setLanguage(locale_accept_from_http($langHeader));
-        }*/
+        }
 
         $feed->setEventTypeFilter($this->request->query('eventType', null));
         $feed->loadData();