From 98309e776e36af6806ab39f5ac130850e19b04ef Mon Sep 17 00:00:00 2001
From: Christy Jacob <christyjacob4@gmail.com>
Date: Tue, 5 Jan 2021 00:00:20 +0530
Subject: [PATCH] feat: fixed failing tests

---
 src/Appwrite/Utopia/Response/Filters/V06.php | 30 +++++++++++---------
 tests/unit/Utopia/Filters/V06Test.php        |  6 +++-
 2 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/src/Appwrite/Utopia/Response/Filters/V06.php b/src/Appwrite/Utopia/Response/Filters/V06.php
index bed31b48bc..9f7124f043 100644
--- a/src/Appwrite/Utopia/Response/Filters/V06.php
+++ b/src/Appwrite/Utopia/Response/Filters/V06.php
@@ -146,15 +146,14 @@ class V06 extends Filter {
     private function parseCurrencyList(array  $content) 
     {
         $content['locations'] = [];
-
         $currencies = $content['currencies'];
         $parsedResponse = [];
         foreach($currencies as $currency) {
             $currency['locations'] = [];
             $parsedResponse[] = $currency;
         }
-
-        return $parsedResponse;
+        $content['currencies'] = $parsedResponse;
+        return $content;
     }
 
     private function parseContinentList(array $content)
@@ -164,8 +163,8 @@ class V06 extends Filter {
         foreach($continents as $continent) {
             $parsedResponse[$continent['code']] = $continent['name'];
         }
-
-        return $parsedResponse;
+        $content['continents'] = $parsedResponse;
+        return $content;
     }
 
     private function parsePhoneList(array $content)
@@ -175,8 +174,8 @@ class V06 extends Filter {
         foreach($phones as $phone) {
             $parsedResponse[$phone['countryCode']] = $phone['code'];
         }
-
-        return $parsedResponse;
+        $content['phones'] = $parsedResponse;
+        return $content;
     }
 
     private function parseCountryList(array $content) 
@@ -186,8 +185,8 @@ class V06 extends Filter {
         foreach($countries as $country) {
             $parsedResponse[$country['code']] = $country['name'];
         }
-
-        return $parsedResponse;
+        $content['countries'] = $parsedResponse;
+        return $content;
     }
 
     private function parseLocale(array $content) 
@@ -216,7 +215,7 @@ class V06 extends Filter {
             $parsedResponse[] = [
                 'event' => $log['event'],
                 'ip' => $log['ip'],
-                'time' => strtotime($log['time']),
+                'time' => $log['time'],
                 'OS' => $log['osName'].' '.$log['osVersion'],
                 'client' => $log['clientName'].' '.$log['clientVersion'],
                 'device' => $log['deviceName'],
@@ -228,7 +227,8 @@ class V06 extends Filter {
                 ]
             ];
         }
-        return $parsedResponse;
+        $content['logs'] = $parsedResponse;
+        return $content;
     }
 
     private function parseSessionList(array $content)
@@ -251,7 +251,8 @@ class V06 extends Filter {
                 ],
             ];
         }
-        return $parsedResponse;
+        $content['sessions'] = $parsedResponse;
+        return $content;
     }
 
     private function parseSession(array $content) 
@@ -267,12 +268,13 @@ class V06 extends Filter {
         foreach($users as $user) {
             $parsedResponse[] = $this->parseUser($user);
         }
-        return $parsedResponse;
+        $content['users'] = $parsedResponse;
+        return $content;
     }
 
     private function parseUser(array $content)
     {
-        foreach (Config::getParam('providers') as $key => $provider) {
+        foreach (Config::getParam('providers', []) as $key => $provider) {
             if (!$provider['enabled']) {
                 continue;
             }
diff --git a/tests/unit/Utopia/Filters/V06Test.php b/tests/unit/Utopia/Filters/V06Test.php
index 42b1bba3f2..71f8b4ca79 100644
--- a/tests/unit/Utopia/Filters/V06Test.php
+++ b/tests/unit/Utopia/Filters/V06Test.php
@@ -39,6 +39,8 @@ class V06Test extends TestCase
             ]
         ];
 
+        Config::load('providers', __DIR__.'/../../../../app/config/providers.php');
+
         $model = Response::MODEL_USER;
         $parsedResponse = $this->filter->parse($content, $model);
 
@@ -73,6 +75,8 @@ class V06Test extends TestCase
             ]
         ];
 
+        Config::load('providers', __DIR__.'/../../../../app/config/providers.php');
+
         $model = Response::MODEL_USER_LIST;
         $parsedResponse = $this->filter->parse($content, $model);
         
@@ -260,7 +264,7 @@ class V06Test extends TestCase
         $parsedResponse = $this->filter->parse($content, $model);
 
         $this->assertEquals($parsedResponse['ip'], '127.0.0.1');
-        $this->assertEquals($parsedResponse['contryCode'], 'US');
+        $this->assertEquals($parsedResponse['countryCode'], 'US');
         $this->assertEquals($parsedResponse['country'], 'United States');
         $this->assertEquals($parsedResponse['continentCode'], 'NA');
         $this->assertEquals($parsedResponse['continent'], 'North America');