GH-791 Finish removing middleware structure

Wunderbyte-GmbH · Jan 24, 2025 · de58f1b · de58f1b
1 parent 3e4e80f
commit de58f1b
Show file tree

Hide file tree

Showing 33 changed files with 215 additions and 458 deletions.
diff --git a/classes/teststrategy/preselect_task.php b/classes/teststrategy/preselect_task.php
@@ -26,7 +26,6 @@
 
 use local_catquiz\local\result;
 use local_catquiz\local\status;
-use local_catquiz\wb_middleware;
 
 /**
  * Base class for a pre-select task.
@@ -43,7 +42,7 @@
  * @copyright 2024 Wunderbyte GmbH
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-abstract class preselect_task implements wb_middleware {
+abstract class preselect_task {
 
     /**
      *

diff --git a/classes/teststrategy/preselect_task/addscalestandarderror.php b/classes/teststrategy/preselect_task/addscalestandarderror.php
@@ -24,14 +24,11 @@
 
 namespace local_catquiz\teststrategy\preselect_task;
 
-use cache;
 use local_catquiz\catscale;
 use local_catquiz\local\model\model_responses;
 use local_catquiz\local\result;
-use local_catquiz\local\status;
 use local_catquiz\teststrategy\preselect_task;
 use local_catquiz\teststrategy\progress;
-use local_catquiz\wb_middleware;
 
 /**
  * Calculates the standarderror for each available catscale.
@@ -45,7 +42,7 @@
  * @copyright 2024 Wunderbyte GmbH
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class addscalestandarderror extends preselect_task implements wb_middleware {
+class addscalestandarderror extends preselect_task {
 
     /**
      * @var progress $progress

diff --git a/classes/teststrategy/preselect_task/checkpagereload.php b/classes/teststrategy/preselect_task/checkpagereload.php
@@ -27,7 +27,6 @@
 use local_catquiz\local\result;
 use local_catquiz\teststrategy\preselect_task;
 use local_catquiz\teststrategy\progress;
-use local_catquiz\wb_middleware;
 
 /**
  * Checks if we have a new response. If not, presents the previous question again.
@@ -36,7 +35,7 @@
  * @copyright 2024 Wunderbyte GmbH
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-final class checkpagereload extends preselect_task implements wb_middleware {
+final class checkpagereload extends preselect_task {
 
     /**
      * @var progress $progress

diff --git a/classes/teststrategy/preselect_task/filterbyquestionsperscale.php b/classes/teststrategy/preselect_task/filterbyquestionsperscale.php
@@ -28,7 +28,6 @@
 use local_catquiz\local\result;
 use local_catquiz\teststrategy\preselect_task;
 use local_catquiz\teststrategy\progress;
-use local_catquiz\wb_middleware;
 
 /**
  * Includes or excludes scales based on the number of questions played
@@ -43,7 +42,7 @@
  * @copyright 2024 Wunderbyte GmbH
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class filterbyquestionsperscale extends preselect_task implements wb_middleware {
+class filterbyquestionsperscale extends preselect_task {
 
     /**
      * @var progress

diff --git a/classes/teststrategy/preselect_task/filterbystandarderror.php b/classes/teststrategy/preselect_task/filterbystandarderror.php
@@ -32,7 +32,6 @@
 use local_catquiz\teststrategy\context\loader\personability_loader;
 use local_catquiz\teststrategy\preselect_task;
 use local_catquiz\teststrategy\progress;
-use local_catquiz\wb_middleware;
 use UnexpectedValueException;
 
 /**
@@ -44,7 +43,7 @@
  * @copyright 2024 Wunderbyte GmbH
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class filterbystandarderror extends preselect_task implements wb_middleware {
+class filterbystandarderror extends preselect_task {
 
     /**
      * @var progress
@@ -66,6 +65,7 @@ class filterbystandarderror extends preselect_task implements wb_middleware {
      *
      */
     public function run(array &$context, callable $next): result {
+        $this->context = $context;
         $this->next = $next;
         $this->progress = $context['progress'];
 

diff --git a/classes/teststrategy/preselect_task/filterbytestinfo.php b/classes/teststrategy/preselect_task/filterbytestinfo.php
@@ -24,14 +24,11 @@
 
 namespace local_catquiz\teststrategy\preselect_task;
 
-use local_catquiz\catquiz;
 use local_catquiz\catscale;
 use local_catquiz\local\model\model_item_param_list;
 use local_catquiz\local\result;
-use local_catquiz\local\status;
 use local_catquiz\teststrategy\preselect_task;
 use local_catquiz\teststrategy\progress;
-use local_catquiz\wb_middleware;
 
 /**
  * Includes or excludes scales based on their information
@@ -42,7 +39,7 @@
  * @copyright 2024 Wunderbyte GmbH
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class filterbytestinfo extends preselect_task implements wb_middleware {
+class filterbytestinfo extends preselect_task {
 
     /**
      * @var progress
@@ -59,6 +56,7 @@ class filterbytestinfo extends preselect_task implements wb_middleware {
      *
      */
     public function run(array &$context, callable $next): result {
+        $this->context = $context;
         $this->progress = $context['progress'];
 
         if (!in_array($context['teststrategy'], [ // TODO: use something like strategy::supports_dynamic_scales()!

diff --git a/classes/teststrategy/preselect_task/firstquestionselector.php b/classes/teststrategy/preselect_task/firstquestionselector.php
@@ -24,18 +24,13 @@
 
 namespace local_catquiz\teststrategy\preselect_task;
 
-use local_catquiz\catcontext;
 use local_catquiz\catquiz;
 use local_catquiz\catscale;
 use local_catquiz\local\model\model_item_param_list;
-use local_catquiz\local\model\model_person_param_list;
-use local_catquiz\local\model\model_responses;
-use local_catquiz\local\model\model_strategy;
 use local_catquiz\local\result;
 use local_catquiz\local\status;
 use local_catquiz\teststrategy\preselect_task;
 use local_catquiz\teststrategy\progress;
-use local_catquiz\wb_middleware;
 use moodle_exception;
 
 /**
@@ -45,7 +40,7 @@
  * @copyright 2024 Wunderbyte GmbH
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class firstquestionselector extends preselect_task implements wb_middleware {
+class firstquestionselector extends preselect_task {
 
     /**
      * @var int

diff --git a/classes/teststrategy/preselect_task/fisherinformation.php b/classes/teststrategy/preselect_task/fisherinformation.php
@@ -26,10 +26,8 @@
 
 use local_catquiz\local\model\model_item_param;
 use local_catquiz\local\model\model_model;
-use local_catquiz\local\model\model_strategy;
 use local_catquiz\local\result;
 use local_catquiz\teststrategy\preselect_task;
-use local_catquiz\wb_middleware;
 
 /**
  * Test strategy fisherinformation.
@@ -38,7 +36,7 @@
  * @copyright 2024 Wunderbyte GmbH
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-final class fisherinformation extends preselect_task implements wb_middleware {
+final class fisherinformation extends preselect_task {
 
     /**
      * Run preselect task.

diff --git a/classes/teststrategy/preselect_task/lasttimeplayedpenalty.php b/classes/teststrategy/preselect_task/lasttimeplayedpenalty.php
@@ -26,7 +26,6 @@
 
 use local_catquiz\local\result;
 use local_catquiz\teststrategy\preselect_task;
-use local_catquiz\wb_middleware;
 use stdClass;
 
 /**
@@ -36,7 +35,7 @@
  * @copyright 2024 Wunderbyte GmbH
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-final class lasttimeplayedpenalty extends preselect_task implements wb_middleware {
+final class lasttimeplayedpenalty extends preselect_task {
 
     /**
      * This is used as factor in the exp function

diff --git a/classes/teststrategy/preselect_task/maximumquestionscheck.php b/classes/teststrategy/preselect_task/maximumquestionscheck.php
@@ -24,12 +24,10 @@
 
 namespace local_catquiz\teststrategy\preselect_task;
 
-use local_catquiz\catcontext;
 use local_catquiz\local\result;
 use local_catquiz\local\status;
 use local_catquiz\teststrategy\preselect_task;
 use local_catquiz\teststrategy\progress;
-use local_catquiz\wb_middleware;
 
 /**
  * Test strategy maximumquestionscheck.
@@ -38,7 +36,7 @@
  * @copyright 2024 Wunderbyte GmbH
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-final class maximumquestionscheck extends preselect_task implements wb_middleware {
+final class maximumquestionscheck extends preselect_task {
 
     /**
      * @var progress $progress
@@ -59,10 +57,7 @@ public function run(array &$context, callable $next): result {
 
         $maxquestions = $context['maximumquestions'];
         if (($maxquestions != -1) && ($context['questionsattempted'] >= $maxquestions)) {
-            // Update the person ability and then end the quiz.
-            $next = fn () => result::err(status::ERROR_REACHED_MAXIMUM_QUESTIONS);
-            $updatepersonability = new updatepersonability();
-            return $updatepersonability->process($context, $next);
+            return result::err(status::ERROR_REACHED_MAXIMUM_QUESTIONS);
         }
 
         return $next($context);

diff --git a/classes/teststrategy/preselect_task/maybe_return_pilot.php b/classes/teststrategy/preselect_task/maybe_return_pilot.php
@@ -24,10 +24,8 @@
 
 namespace local_catquiz\teststrategy\preselect_task;
 
-use cache;
 use local_catquiz\local\result;
 use local_catquiz\teststrategy\preselect_task;
-use local_catquiz\wb_middleware;
 
 /**
  * Randomly returns a pilot question according to the `pilot_ratio` parameter
@@ -36,7 +34,7 @@
  * @copyright 2024 Wunderbyte GmbH
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class maybe_return_pilot extends preselect_task implements wb_middleware {
+class maybe_return_pilot extends preselect_task {
 
     /**
      * Run preselect task.
@@ -48,6 +46,7 @@ class maybe_return_pilot extends preselect_task implements wb_middleware {
      *
      */
     public function run(array &$context, callable $next): result {
+        $this->context = $context;
         if ($context['pilot_ratio'] === 0) {
             return $next($context);
         }

diff --git a/classes/teststrategy/preselect_task/maybe_return_pilot_testing.php b/classes/teststrategy/preselect_task/maybe_return_pilot_testing.php
@@ -24,16 +24,14 @@
 
 namespace local_catquiz\teststrategy\preselect_task;
 
-use local_catquiz\wb_middleware;
-
 /**
  * Randomly returns a pilot question according to the `pilot_ratio` parameter
  *
  * @package local_catquiz
  * @copyright 2024 Wunderbyte GmbH
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-final class maybe_return_pilot_testing extends maybe_return_pilot implements wb_middleware {
+final class maybe_return_pilot_testing extends maybe_return_pilot {
 
     /**
      * This value is used to return a pilot question.

diff --git a/classes/teststrategy/preselect_task/mayberemovescale.php b/classes/teststrategy/preselect_task/mayberemovescale.php
@@ -24,11 +24,9 @@
 
 namespace local_catquiz\teststrategy\preselect_task;
 
-use cache;
 use local_catquiz\local\result;
 use local_catquiz\teststrategy\preselect_task;
 use local_catquiz\teststrategy\progress;
-use local_catquiz\wb_middleware;
 
 /**
  * Checks if subscales should be excluded and removes the respective questions
@@ -37,7 +35,7 @@
  * @copyright 2024 Wunderbyte GmbH
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-final class mayberemovescale extends preselect_task implements wb_middleware {
+final class mayberemovescale extends preselect_task {
 
     /**
      * @var progress

diff --git a/classes/teststrategy/preselect_task/noremainingquestions.php b/classes/teststrategy/preselect_task/noremainingquestions.php
@@ -27,7 +27,6 @@
 use local_catquiz\local\result;
 use local_catquiz\local\status;
 use local_catquiz\teststrategy\preselect_task;
-use local_catquiz\wb_middleware;
 
 /**
  * Test strategy noremainingquestions.
@@ -36,7 +35,7 @@
  * @copyright 2024 Wunderbyte GmbH
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-final class noremainingquestions extends preselect_task implements wb_middleware {
+final class noremainingquestions extends preselect_task {
 
     /**
      * Run preselect task.

diff --git a/classes/teststrategy/preselect_task/numberofgeneralattempts.php b/classes/teststrategy/preselect_task/numberofgeneralattempts.php
@@ -26,7 +26,6 @@
 
 use local_catquiz\local\result;
 use local_catquiz\teststrategy\preselect_task;
-use local_catquiz\wb_middleware;
 
 /**
  * Adds a `numberofgeneralattempts` property to each question
@@ -38,7 +37,7 @@
  * @copyright 2024 Wunderbyte GmbH
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class numberofgeneralattempts extends preselect_task implements wb_middleware {
+class numberofgeneralattempts extends preselect_task {
 
     /**
      * Run preselect task.

diff --git a/classes/teststrategy/preselect_task/playedincurrentattempt.php b/classes/teststrategy/preselect_task/playedincurrentattempt.php
@@ -27,7 +27,6 @@
 use local_catquiz\local\result;
 use local_catquiz\teststrategy\preselect_task;
 use local_catquiz\teststrategy\progress;
-use local_catquiz\wb_middleware;
 
 /**
  * Class playedincurrentattempt for test strategy.
@@ -36,7 +35,7 @@
  * @copyright 2024 Wunderbyte GmbH
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-final class playedincurrentattempt extends preselect_task implements wb_middleware {
+final class playedincurrentattempt extends preselect_task {
 
     /**
      * PENALTY

diff --git a/classes/teststrategy/preselect_task/remove_uncalculated.php b/classes/teststrategy/preselect_task/remove_uncalculated.php
@@ -26,7 +26,6 @@
 
 use local_catquiz\local\result;
 use local_catquiz\teststrategy\preselect_task;
-use local_catquiz\wb_middleware;
 
 /**
  * Removes questions for which no item parameters were calculated yet
@@ -35,7 +34,7 @@
  * @copyright 2024 Wunderbyte GmbH
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-final class remove_uncalculated extends preselect_task implements wb_middleware {
+final class remove_uncalculated extends preselect_task {
 
     /**
      * Run preselect task.
@@ -51,7 +50,12 @@ public function run(array &$context, callable $next): result {
             $context['questions'],
             fn($item) => !is_null($item->model)
         );
-        return $next($context);
+        // After removing questions, check if we still  have some.
+        $noremainingquestions = new noremainingquestions();
+        return $noremainingquestions->run(
+            $context,
+            fn ($context) => result::ok($context)
+        );
     }
 
     /**

diff --git a/classes/teststrategy/preselect_task/removeplayedquestions.php b/classes/teststrategy/preselect_task/removeplayedquestions.php
@@ -27,7 +27,6 @@
 use local_catquiz\local\result;
 use local_catquiz\teststrategy\preselect_task;
 use local_catquiz\teststrategy\progress;
-use local_catquiz\wb_middleware;
 
 /**
  * Class removeplayedquestions removes questions that were already shown to the user in the current quiz attempt.
@@ -36,7 +35,7 @@
  * @copyright 2024 Wunderbyte GmbH
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-final class removeplayedquestions extends preselect_task implements wb_middleware {
+final class removeplayedquestions extends preselect_task {
 
     /**
      * @var progress