Don't save RateQuery errors to the cache

Sub-Tech · Sep 21, 2020 · 999adfa · 999adfa
1 parent 32bf299
commit 999adfa
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/src/Conversion.php b/src/Conversion.php
@@ -63,8 +63,11 @@ protected function init($fromCurrency, $toCurrency, $value, $ttl = 86400, $old =
         if (!$cachedRateData) {
             try {
                 $this->rateQuery = new RateQuery($fromCurrency, $toCurrency);
-                $this->cache->saveToCache($cacheFilename, $this->rateQuery->getData());
-                $cachedRateData = $this->rateQuery->getData();
+	            $rateData = $this->rateQuery->getData();
+	            if($rateData){
+                    $this->cache->saveToCache($cacheFilename, $rateData);
+	            }
+                $cachedRateData = $rateData;
             } catch (\Exception $e) {
                 if ($old == false) {
                     return $this->init($fromCurrency, $toCurrency, $value, $ttl, true);

diff --git a/src/RateQuery.php b/src/RateQuery.php
@@ -14,9 +14,18 @@ public function __construct($fromCurrency, $toCurrency)
     {
 
         $this->query = new Query();
-        $this->data = $this->query->execute($fromCurrency, $toCurrency)->getData();
-        if (!$this->data) {
-            throw new \Exception('No Exchange Rate Data Received!');
-        }
+        $data = $this->query->execute($fromCurrency, $toCurrency)->getData();
+
+	    if (!$data) {
+		    $this->data = null;
+		    throw new \Exception('No Exchange Rate Data Received!');
+	    }
+
+	    if( !isset($data->status) || $data->status != "ok"){
+		    $this->data = null;
+		    throw new \Exception('Error in received exchange rate data');
+	    }
+
+	    $this->data = $data;
     }
 }