L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-48443-master' of git://github.com/jleyva/moodle

Browse Source
This commit is contained in:
Dan Poltawski
2015-03-23 15:03:56 +00:00
parent 07eb5a1f5c 4bf3a71380
commit 51a1d6bbf4
2 changed files with 50 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
user/externallib.php
+27 -13
View File
@@ -1128,20 +1128,34 @@ class core_user_external extends external_api {
return $warnings;
}
$userdevice = new stdclass;
$userdevice->userid = $USER->id;
$userdevice->appid = $params['appid'];
$userdevice->name = $params['name'];
$userdevice->model = $params['model'];
$userdevice->platform = $params['platform'];
$userdevice->version = $params['version'];
$userdevice->pushid = $params['pushid'];
$userdevice->uuid = $params['uuid'];
$userdevice->timecreated = time();
$userdevice->timemodified = $userdevice->timecreated;
// Notice that we can have multiple devices because previously it was allowed to have repeated ones.
// Since we don't have a clear way to decide which one is the more appropiate, we update all.
if ($userdevices = $DB->get_records('user_devices', array('uuid' => $params['uuid'],
'appid' => $params['appid'], 'userid' => $USER->id))) {
if (!$DB->insert_record('user_devices', $userdevice)) {
throw new moodle_exception("There was a problem saving in the database the device with key: " . $params['pushid']);
foreach ($userdevices as $userdevice) {
$userdevice->version = $params['version']; // Maybe the user upgraded the device.
$userdevice->pushid = $params['pushid'];
$userdevice->timemodified = time();
$DB->update_record('user_devices', $userdevice);
}
} else {
$userdevice = new stdclass;
$userdevice->userid = $USER->id;
$userdevice->appid = $params['appid'];
$userdevice->name = $params['name'];
$userdevice->model = $params['model'];
$userdevice->platform = $params['platform'];
$userdevice->version = $params['version'];
$userdevice->pushid = $params['pushid'];
$userdevice->uuid = $params['uuid'];
$userdevice->timecreated = time();
$userdevice->timemodified = $userdevice->timecreated;
if (!$DB->insert_record('user_devices', $userdevice)) {
throw new moodle_exception("There was a problem saving in the database the device with key: " . $params['pushid']);
}
}
return $warnings;
user/tests/externallib_test.php
+23
View File
@@ -749,6 +749,29 @@ class core_user_externallib_testcase extends externallib_advanced_testcase {
$created = (array) $created;
$this->assertEquals($device, array_intersect_key((array)$created, $device));
// Test reuse the same pushid value.
$warnings = core_user_external::add_user_device($device['appid'], $device['name'], $device['model'], $device['platform'],
$device['version'], $device['pushid'], $device['uuid']);
// We need to execute the return values cleaning process to simulate the web service server.
$warnings = external_api::clean_returnvalue(core_user_external::add_user_device_returns(), $warnings);
$this->assertCount(1, $warnings);
// Test update an existing device.
$device['pushid'] = 'different than before';
$warnings = core_user_external::add_user_device($device['appid'], $device['name'], $device['model'], $device['platform'],
$device['version'], $device['pushid'], $device['uuid']);
$this->assertEquals(1, $DB->count_records('user_devices'));
$updated = $DB->get_record('user_devices', array('pushid' => $device['pushid']));
$this->assertEquals($device, array_intersect_key((array)$updated, $device));
// Test creating a new device just changing the uuid.
$device['uuid'] = 'newuidforthesameuser';
$device['pushid'] = 'new different than before';
$warnings = core_user_external::add_user_device($device['appid'], $device['name'], $device['model'], $device['platform'],
$device['version'], $device['pushid'], $device['uuid']);
$this->assertEquals(2, $DB->count_records('user_devices'));
}
/**