GH-791 Make first question selector and page reload check normal methods

Author: davidszkiba

classes/teststrategy/preselect_task/firstquestionselector.php

@@ -94,6 +94,7 @@ class firstquestionselector extends preselect_task implements wb_middleware {
      */
     public function run(array &$context, callable $next): result {
         $this->progress = $context['progress'];
+        $this->context = $context;
         // Don't do anything if this is not the first question of the current attempt.
         if (!$this->progress->is_first_question()) {
             return $next($context);

classes/teststrategy/strategy.php

@@ -179,6 +179,28 @@ public function return_next_testitem(array $context) {
             return $checkbreakres;
         }
 
+        if ($this->pre_check_page_reload()) {
+            $res = $this->check_page_reload();
+            if ($res->unwrap()) {
+                return $res;
+            }
+        }
+
+        if ($this->pre_check_first_question_selector()) {
+            $res = $this->first_question_selector();
+            if ($res->iserr()) {
+                return $res;
+            }
+            $val = $res->unwrap();
+            // If the result contains a single object, this is the question to be returned.
+            // Othewise, it contains the updated $context array with the ability and standarderror set in such a way, that the
+            // teststrategy will return the correct question (e.g. the question corresponding to mean ability of all students).
+            if (is_object($val)) {
+                return $res;
+            }
+            $this->context = $val;
+        }
+
         foreach ($this->get_preselecttasks() as $modifier) {
             // When this is called for running tests, check if there is a
             // X_testing class and if so, use that one.
@@ -230,6 +252,28 @@ public function return_next_testitem(array $context) {
         return result::ok($selectedquestion);
     }
 
+    /**
+     * If true, the check page reload is called before updating the ability.
+     *
+     * Quickfix, could probabily be removed.
+     *
+     * @return bool
+     */
+    protected function pre_check_page_reload(): bool {
+        return false;
+    }
+
+    /**
+     * If true, the first question selector is called before updating the ability.
+     *
+     * Quickfix, could probabily be removed.
+     *
+     * @return bool
+     */
+    protected function pre_check_first_question_selector(): bool {
+        return false;
+    }
+
     /**
      * Helper method to update attempt feedback data
      *
@@ -524,8 +568,7 @@ protected function maybereturnpilot(): result {
      */
     protected function first_question_selector(): result {
         $firstquestionselector = new firstquestionselector();
-        $result = $firstquestionselector->run($this->context, fn ($context) => result::ok($context));
-        return $result;
+        return $firstquestionselector->run($this->context, fn ($context) => result::ok($context));
     }
 
     /**

classes/teststrategy/strategy/classicalcat.php

@@ -75,7 +75,6 @@ class classicalcat extends strategy {
      */
     public function get_preselecttasks(): array {
         return [
-            checkpagereload::class,
             updatepersonability::class,
             addscalestandarderror::class,
             maximumquestionscheck::class,
@@ -87,6 +86,18 @@ public function get_preselecttasks(): array {
             strategyclassicscore::class,
         ];
     }
+
+    /**
+     * If true, the check page reload is called before updating the ability.
+     *
+     * Quickfix, could probabily be removed.
+     *
+     * @return bool
+     */
+    protected function pre_check_page_reload(): bool {
+        return false;
+    }
+
     /**
      * Returns feedback generators.
      *

classes/teststrategy/strategy/teststrategy_fastest.php

@@ -79,8 +79,6 @@ class teststrategy_fastest extends strategy {
      */
     public function get_preselecttasks(): array {
         return [
-            checkpagereload::class,
-            firstquestionselector::class,
             updatepersonability::class,
             fisherinformation::class,
             addscalestandarderror::class,
@@ -96,6 +94,28 @@ public function get_preselecttasks(): array {
         ];
     }
 
+    /**
+     * If true, the check page reload is called before updating the ability.
+     *
+     * Quickfix, could probabily be removed.
+     *
+     * @return bool
+     */
+    protected function pre_check_page_reload(): bool {
+        return true;
+    }
+
+    /**
+     * If true, the first question selector is called before updating the ability.
+     *
+     * Quickfix, could probabily be removed.
+     *
+     * @return bool
+     */
+    protected function pre_check_first_question_selector(): bool {
+        return true;
+    }
+
     /**
      * Get feedback generators.
      *