From 2e5bea2052c2357ec98ec01aec5128b1e09fd13e Mon Sep 17 00:00:00 2001
From: Mikhail Golenkov <mikhailgolenkov@catalyst-au.net>
Date: Sun, 14 Nov 2021 18:54:10 +1100
Subject: [PATCH] Issue 14: Fix failing phpunit due to unpredictable sorting

---
 lib.php                 | 1 +
 tests/grade_me_test.php | 6 ++----
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/lib.php b/lib.php
index becd67d..7e62fcf 100644
--- a/lib.php
+++ b/lib.php
@@ -57,6 +57,7 @@ function block_grade_me_query_suffix($mod) {
         $maxtimesubmitted = time() - ((int)$maxage * DAYSECS);
         $query .= " WHERE allitems.timesubmitted >= " . $maxtimesubmitted;
     }
+    $query .= ' ORDER BY submissionid ASC';
     return $query;
 }
 
diff --git a/tests/grade_me_test.php b/tests/grade_me_test.php
index 30917cc..c1d4b0e 100644
--- a/tests/grade_me_test.php
+++ b/tests/grade_me_test.php
@@ -460,8 +460,7 @@ public function test_query_quiz($datafile, $expected) {
         $this->update_quiz_ngrade();
 
         list($sql, $params) = block_grade_me_query_quiz(array($users[0]->id));
-        $sql = block_grade_me_query_prefix() . $sql . block_grade_me_query_suffix('quiz') .
-            ' ORDER BY submissionid ASC';
+        $sql = block_grade_me_query_prefix() . $sql . block_grade_me_query_suffix('quiz');
 
         $actual = array();
         $result = $DB->get_recordset_sql($sql, array($params[0], $courses[0]->id));
@@ -671,8 +670,7 @@ public function standard_query_tests($datafile, $expected, $suffix) {
 
         $dbfunction = 'block_grade_me_query_' . $suffix;
         list($sql, $params) = $dbfunction(array($users[0]->id));
-        $sql = block_grade_me_query_prefix() . $sql . block_grade_me_query_suffix($suffix) .
-            ' ORDER BY submissionid ASC';
+        $sql = block_grade_me_query_prefix() . $sql . block_grade_me_query_suffix($suffix);
 
         $actual = array();
         $result = $DB->get_recordset_sql($sql, array($params[0], $courses[0]->id));