CodeMirror/appwrite
1
0
Fork 0
mirror of synced 2024-06-29 03:30:34 +12:00
Code Issues Projects Releases Wiki Activity

feat: changed log list response format and added tests

Browse source
This commit is contained in:
Christy Jacob 2021-01-05 17:51:17 +05:30
parent 2b9a9efca5
commit a58107b49c
2 changed files with 34 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/Appwrite/Utopia/Response/Filters/V06.php
View file

@ -215,17 +215,28 @@ class V06 extends Filter {
$parsedResponse = [];
foreach($logs as $log) {
$parsedResponse[] = [
'brand' => $log['deviceBrand'],
'device' => $log['deviceName'],
'event' => $log['event'],
'ip' => $log['ip'],
'time' => $log['time'],
'OS' => $log['osName'].' '.$log['osVersion'],
'client' => $log['clientName'].' '.$log['clientVersion'],
'device' => $log['deviceName'],
'brand' => $log['deviceBrand'],
'model' => $log['deviceModel'],
'time' => $log['time'],
'geo' => [
'isoCode' => empty($log['countryCode']) ? '---' : $log['countryCode'] ,
'country' => empty($log['countryName'] ) ? Locale::getText('locale.country.unknown') : $log['countryName']
],
'OS' => [
'name' => $log['osName'],
'platform' => '',
'short_name' => $log['osCode'],
'version' => $log['osVersion']
],
'client' => [
'engine' => $log['clientEngine'],
'name' => $log['clientName'],
'short_name' => $log['clientCode'],
'type' => $log['clientType'],
'version' => $log['clientVersion']
]
];
}

26
tests/unit/Utopia/Filters/V06Test.php
View file

@ -184,7 +184,7 @@ class V06Test extends TestCase
$this->assertEquals($parsedResponse['sessions'][0]['OS']['name'], 'Mac');
$this->assertEquals($parsedResponse['sessions'][0]['OS']['platform'], '');
$this->assertEquals($parsedResponse['sessions'][0]['OS']['short_name'], 'Mac');
$this->assertEquals($parsedResponse['sessions'][0]['OS']['version'], '');
$this->assertEquals($parsedResponse['sessions'][0]['OS']['version'], 'Mac');
$this->assertEquals($parsedResponse['sessions'][0]['client']['engine'], 'WebKit');
$this->assertEquals($parsedResponse['sessions'][0]['client']['name'], 'Chrome Mobile iOS');
@ -227,16 +227,26 @@ class V06Test extends TestCase
$parsedResponse = $this->filter->parse($content, $model);
$this->assertEquals($parsedResponse['sum'], 1);
$this->assertEquals($parsedResponse['logs'][0]['brand'], 'Google');
$this->assertEquals($parsedResponse['logs'][0]['device'], 'smartphone');
$this->assertEquals($parsedResponse['logs'][0]['event'], 'account.sessions.create');
$this->assertEquals($parsedResponse['logs'][0]['ip'], '127.0.0.1');
$this->assertEquals($parsedResponse['logs'][0]['time'], 1592981250);
$this->assertEquals($parsedResponse['logs'][0]['OS'], 'Mac Mac');
$this->assertEquals($parsedResponse['logs'][0]['client'], 'Chrome Mobile iOS 84.0');
$this->assertEquals($parsedResponse['logs'][0]['device'], 'smartphone');
$this->assertEquals($parsedResponse['logs'][0]['brand'], 'Google');
$this->assertEquals($parsedResponse['logs'][0]['model'], 'Nexus 5');
$this->assertEquals($parsedResponse['logs'][0]['geo']['isoCode'], 'US');
$this->assertEquals($parsedResponse['logs'][0]['geo']['country'], 'United States');
$this->assertEquals($parsedResponse['logs'][0]['time'], 1592981250);
$this->assertEquals($parsedResponse['sessions'][0]['OS']['name'], 'Mac');
$this->assertEquals($parsedResponse['sessions'][0]['OS']['platform'], '');
$this->assertEquals($parsedResponse['sessions'][0]['OS']['short_name'], 'Mac');
$this->assertEquals($parsedResponse['sessions'][0]['OS']['version'], 'Mac');
$this->assertEquals($parsedResponse['sessions'][0]['client']['engine'], 'WebKit');
$this->assertEquals($parsedResponse['sessions'][0]['client']['name'], 'Chrome Mobile iOS');
$this->assertEquals($parsedResponse['sessions'][0]['client']['short_name'], 'CM');
$this->assertEquals($parsedResponse['sessions'][0]['client']['type'], 'browser');
$this->assertEquals($parsedResponse['sessions'][0]['client']['version'], '84.0');
$this->assertEquals($parsedResponse['sessions'][0]['geo']['isoCode'], 'US');
$this->assertEquals($parsedResponse['sessions'][0]['geo']['country'], 'United States');
}
public function testParseToken()