From 2da7da0558bcdbab9855a926aba7ce2fd1b0d2bb Mon Sep 17 00:00:00 2001 From: Steven Nguyen Date: Tue, 13 Sep 2022 21:18:13 +0000 Subject: [PATCH] Remove response parse of log $createdAt and $updatedAt --- src/Appwrite/Utopia/Response/Filters/V15.php | 2 +- .../unit/Utopia/Response/Filters/V15Test.php | 50 +++++++++++++++++-- 2 files changed, 47 insertions(+), 5 deletions(-) diff --git a/src/Appwrite/Utopia/Response/Filters/V15.php b/src/Appwrite/Utopia/Response/Filters/V15.php index 8c56e65e2..8e688d58f 100644 --- a/src/Appwrite/Utopia/Response/Filters/V15.php +++ b/src/Appwrite/Utopia/Response/Filters/V15.php @@ -377,7 +377,7 @@ class V15 extends Filter private function parseLog($content) { - $content = $this->parseDatetimeAttributes($content, ['$createdAt', '$updatedAt', 'time']); + $content = $this->parseDatetimeAttributes($content, ['time']); return $content; } diff --git a/tests/unit/Utopia/Response/Filters/V15Test.php b/tests/unit/Utopia/Response/Filters/V15Test.php index 8998c759b..a68da474d 100644 --- a/tests/unit/Utopia/Response/Filters/V15Test.php +++ b/tests/unit/Utopia/Response/Filters/V15Test.php @@ -832,14 +832,57 @@ class V15Test extends TestCase { return [ 'basic log' => [ - ['time' => '2020-06-24T06:47:30.000Z'], - ['time' => 1592981250], + [ + 'event' => 'account.sessions.create', + 'userId' => '610fc2f985ee0', + 'userEmail' => 'john@appwrite.io', + 'userName' => 'John Doe', + 'mode' => 'admin', + 'ip' => '127.0.0.1', + 'time' => '2020-06-24T06:47:30.000Z', + 'osCode' => 'Mac', + 'osName' => 'Mac', + 'osVersion' => 'Mac', + 'clientType' => 'browser', + 'clientCode' => 'CM', + 'clientName' => 'Chrome Mobile iOS', + 'clientVersion' => '84.0', + 'clientEngine' => 'WebKit', + 'clientEngineVersion' => '605.1.15', + 'deviceName' => 'smartphone', + 'deviceBrand' => 'Google', + 'deviceModel' => 'Nexus 5', + 'countryCode' => 'US', + 'countryName' => 'United States' + ], + [ + 'event' => 'account.sessions.create', + 'userId' => '610fc2f985ee0', + 'userEmail' => 'john@appwrite.io', + 'userName' => 'John Doe', + 'mode' => 'admin', + 'ip' => '127.0.0.1', + 'time' => 1592981250, + 'osCode' => 'Mac', + 'osName' => 'Mac', + 'osVersion' => 'Mac', + 'clientType' => 'browser', + 'clientCode' => 'CM', + 'clientName' => 'Chrome Mobile iOS', + 'clientVersion' => '84.0', + 'clientEngine' => 'WebKit', + 'clientEngineVersion' => '605.1.15', + 'deviceName' => 'smartphone', + 'deviceBrand' => 'Google', + 'deviceModel' => 'Nexus 5', + 'countryCode' => 'US', + 'countryName' => 'United States' + ] ], ]; } /** - * @dataProvider createdAtUpdatedAtProvider * @dataProvider logProvider */ public function testLog(array $content, array $expected): void @@ -852,7 +895,6 @@ class V15Test extends TestCase } /** - * @dataProvider createdAtUpdatedAtProvider * @dataProvider logProvider */ public function testLogList(array $content, array $expected): void