Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Issue 606: Transforming event having userid=0 creates exception fix. #729

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Issue 606: Transforming event having userid=0 creates exception fix. #729

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bf51608
Issue 606: Transforming event having userid=0 creates exception fix.
mlynn-lp Jun 4, 2020
3d2b777
Issue 606: set the relateduserid or userid if not set to 0 otherwise …
mlynn-lp Jun 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion src/transformer/events/core/course_viewed.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,16 @@
use src\transformer\utils as utils;

function course_viewed(array $config, \stdClass $event) {
global $CFG;

$repo = $config['repo'];
$user = $repo->read_record_by_id('user', $event->userid);

// Get the userid or a valid userid for guest.
if (!isset($event->userid)) {
$event->userid = 0;
}
$userid = $event->userid == 0 && isset($CFG->siteguest) ? $CFG->siteguest : $event->userid;
Copy link
Contributor

@gordonmacqueen-lp gordonmacqueen-lp Jun 4, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mlynn-lp
Can the logic here be extracted out to a utility function?
It could take the config, event and an identifier for the field we are interested in (userid or relateduserid)

This way, it can be reused elsewhere too (like here).

$user = $repo->read_record_by_id('user', $userid);
$course = $repo->read_record_by_id('course', $event->courseid);
$lang = utils\get_course_lang($course);

Expand Down
11 changes: 10 additions & 1 deletion src/transformer/events/core/user_created.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,17 @@
use src\transformer\utils as utils;

function user_created(array $config, \stdClass $event) {
global $CFG;

$repo = $config['repo'];
$user = $repo->read_record_by_id('user', $event->relateduserid);

// Get the relateduserid or a valid relateduserid from the guest userid.
if (!isset($event->relateduserid)) {
$event->relateduserid = 0;
}
$relateduserid = $event->relateduserid == 0 && isset($CFG->siteguest) ? $CFG->siteguest : $event->relateduserid;
$user = $repo->read_record_by_id('user', $relateduserid);

$lang = $config['source_lang'];

return [[
Expand Down