MDL-42583 events: Fix snapshot issues with note events

ralferlebach · Oct 31, 2013 · 9bb0353 · 9bb0353
1 parent 68291f2
commit 9bb0353
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/notes/lib.php b/notes/lib.php
@@ -111,7 +111,6 @@ function note_save(&$note) {
             'context' => context_course::instance($note->courseid),
             'other' => array('publishstate' => $note->publishstate)
         ));
-        $event->add_record_snapshot('post', $note);
         $event->trigger();
     } else {
         // Update old note.
@@ -127,7 +126,6 @@ function note_save(&$note) {
             'context' => context_course::instance($note->courseid),
             'other' => array('publishstate' => $note->publishstate)
         ));
-        $event->add_record_snapshot('post', $note);
         $event->trigger();
     }
     unset($note->module);
@@ -143,9 +141,12 @@ function note_save(&$note) {
 function note_delete($note) {
     global $DB;
     if (is_int($note)) {
-        $note = note_load($note);
-        debugging('Warning: providing note_delete with a note object would improve performance.', DEBUG_DEVELOPER);
+        $noteid = $note;
+    } else {
+        $noteid = $note->id;
     }
+    // Get the full record, note_load doesn't return everything.
+    $note = $DB->get_record('post', array('id' => $noteid), '*', MUST_EXIST);
     $return = $DB->delete_records('post', array('id' => $note->id, 'module' => 'notes'));
 
     // Trigger event.

diff --git a/notes/tests/events_test.php b/notes/tests/events_test.php
@@ -38,7 +38,11 @@ class core_notes_events_testcase extends advanced_testcase {
     /** @var  stdClass A note object. */
     private $eventnote;
 
+    /** @var stdClass A complete record from post table */
+    private $noterecord;
+
     public function setUp() {
+        global $DB;
 
         $this->resetAfterTest();
         $this->setAdminUser();
@@ -47,6 +51,8 @@ public function setUp() {
         $user = $this->getDataGenerator()->create_user();
         $gen = $this->getDataGenerator()->get_plugin_generator('core_notes');
         $this->eventnote = $gen->create_instance(array('courseid' => $course->id, 'userid' => $user->id));
+        // Get the full record, note_load doesn't return everything.
+        $this->noterecord = $DB->get_record('post', array('id' => $this->eventnote->id), '*', MUST_EXIST);
 
     }
 
@@ -68,7 +74,7 @@ public function test_note_deleted_event() {
         $this->assertEquals($this->eventnote->userid, $event->relateduserid);
         $this->assertEquals('post', $event->objecttable);
         $this->assertEquals(null, $event->get_url());
-        $this->assertEquals($this->eventnote, $event->get_record_snapshot('post', $event->objectid));
+        $this->assertEquals($this->noterecord, $event->get_record_snapshot('post', $event->objectid));
         $this->assertEquals(NOTES_STATE_SITE, $event->other['publishstate']);
 
         // Test legacy data.
@@ -99,7 +105,6 @@ public function test_note_created_event() {
         $this->assertEquals($note->usermodified, $event->userid);
         $this->assertEquals($note->userid, $event->relateduserid);
         $this->assertEquals('post', $event->objecttable);
-        $this->assertEquals($note, $event->get_record_snapshot('post', $event->objectid));
         $this->assertEquals(NOTES_STATE_SITE, $event->other['publishstate']);
 
         // Test legacy data.
@@ -131,7 +136,6 @@ public function test_note_updated_event() {
         $this->assertEquals($note->usermodified, $event->userid);
         $this->assertEquals($note->userid, $event->relateduserid);
         $this->assertEquals('post', $event->objecttable);
-        $this->assertEquals($note, $event->get_record_snapshot('post', $event->objectid));
         $this->assertEquals(NOTES_STATE_DRAFT, $event->other['publishstate']);
 
         // Test legacy data.