Test 46659: Add Org-Unit Filter to Manual Scoring

components/ILIAS/Test/classes/class.ilObjTest.php

@@ -4297,7 +4297,7 @@ public function getTestParticipants(): array
 				LEFT JOIN usr_data
 				ON tst_active.user_fi = usr_data.usr_id
 				WHERE tst_active.test_fi = %s
-				ORDER BY usr_data.lastname
+				ORDER BY usr_data.lastname, usr_data.firstname, tst_active.active_id
 			";
             $result = $this->db->queryF(
                 $query,
@@ -4321,7 +4321,7 @@ public function getTestParticipants(): array
 				LEFT JOIN usr_data
 				ON tst_active.user_fi = usr_data.usr_id
 				WHERE tst_active.test_fi = %s
-				ORDER BY usr_data.lastname
+				ORDER BY usr_data.lastname, usr_data.firstname, tst_active.active_id
 			";
             $result = $this->db->queryF(
                 $query,

components/ILIAS/Test/src/GUIFactory.php

@@ -76,15 +76,15 @@ public function __construct(
                     $this->internal['manscoring.testscoring']($test_obj),
                     $this->test_dic['scoring.manual.done_helper'],
                     $this->global_dic['ilUser'],
-                    $this->internal['test.access']($test_obj),
                     $this->test_dic['participant.repository'],
                     $this->global_dic['lng'],
                 );
 
         $this->internal['manscoring.positionsfactory'] = fn(\ilObjTest $test_obj): PositionsFactory =>
             new PositionsFactory(
                 $test_obj,
-                $this->test_dic['question.general_properties.repository']
+                $this->test_dic['question.general_properties.repository'],
+                $this->test_dic['participant.access_filter.factory']
             );
 
         $this->internal['manscoring.testscoring'] = fn(\ilObjTest $test_obj): TestScoring =>

components/ILIAS/Test/src/Scoring/Manual/ConsecutiveScoring.php

@@ -29,6 +29,11 @@
 
 class ConsecutiveScoring
 {
+    /**
+     * @var int[]
+     */
+    private array $anon_only_participant_ids;
+
     public function __construct(
         private readonly Positions $positions,
         private readonly \ilObjTest $object,
@@ -37,10 +42,10 @@ public function __construct(
         private TestScoring $scorer,
         private TestManScoringDoneHelper $scoring_done_helper,
         private \ilObjUser $current_user,
-        private readonly \ilTestAccess $test_access,
         private readonly ParticipantRepository $participant_repository,
         private readonly Language $lng,
     ) {
+        $this->anon_only_participant_ids = $this->object->getAnonOnlyParticipantIds();
     }
 
     public function getPositions(): Positions
@@ -92,13 +97,11 @@ public function getUserFullName(
         int $usr_active_id,
         string $attempt
     ): string {
-        if ($this->object->getAnonymity()
-            || !$this->test_access->checkScoreParticipantsAccess()
-        ) {
+        $participant = $this->participant_repository->getParticipantByActiveId($this->object->getTestId(), $usr_active_id);
+
+        if ($this->shouldUsePseudonymousParticipantLabel($participant->getUserId())) {
             return \ilObjTest::buildExamId($usr_active_id, $attempt, $this->object->getId());
         }
-
-        $participant = $this->participant_repository->getParticipantByActiveId($this->object->getTestId(), $usr_active_id);
         $importname = $participant->getImportname();
         $user_id = $participant->getUserId();
         if ($user_id === ANONYMOUS_USER_ID && $importname !== null && $importname !== '') {
@@ -119,12 +122,22 @@ public function getUserId(
         int $usr_active_id,
         string $attempt,
     ): string {
-        if ($this->object->getAnonymity()
-            || !$this->test_access->checkScoreParticipantsAccess()
-        ) {
+        $user_id = $this->object->_getUserIdFromActiveId($usr_active_id);
+
+        if ($this->shouldUsePseudonymousParticipantLabel($user_id)) {
             return \ilObjTest::buildExamId($usr_active_id, $attempt, $this->object->getId());
         }
-        return (string) $this->object->_getUserIdFromActiveId($usr_active_id);
+
+        return (string) $user_id;
+    }
+
+    private function shouldUsePseudonymousParticipantLabel(int $user_id): bool
+    {
+        if ($this->object->getAnonymity()) {
+            return true;
+        }
+
+        return in_array($user_id, $this->anon_only_participant_ids, true);
     }
 
     public function getSingleManualFeedback(int $qid, int $usr_active_id, int $attempt_id): array

components/ILIAS/Test/src/Scoring/Manual/PositionsFactory.php

@@ -26,7 +26,8 @@ class PositionsFactory
 {
     public function __construct(
         private readonly \ilObjTest $test_obj,
-        private readonly GeneralQuestionPropertiesRepository $question_repo
+        private readonly GeneralQuestionPropertiesRepository $question_repo,
+        private readonly \ilTestParticipantAccessFilterFactory $participant_access_filter_factory
     ) {
     }
 
@@ -35,7 +36,10 @@ public function get(): Positions
         $user_questions = [];
         $user_attempts = [];
         $question_properties = [];
-        foreach (array_keys($this->test_obj->getTestParticipants()) as $usr_active_id) {
+
+        $test_participants = $this->filterParticipantsByAccessOfCurrentUser($this->test_obj->getTestParticipants());
+
+        foreach (array_keys($test_participants) as $usr_active_id) {
             $attempt = \ilObjTest::_getResultPass($usr_active_id);
             $user_attempts[$usr_active_id] = $attempt;
             $user_questions[$usr_active_id] = $this->test_obj->isRandomTest()
@@ -73,4 +77,17 @@ public function get(): Positions
             $question_properties
         );
     }
+
+    private function filterParticipantsByAccessOfCurrentUser(array $test_participants): array
+    {
+        $allowed_user_ids = $this->participant_access_filter_factory
+            ->getScoreParticipantsUserFilter($this->test_obj->getRefId())(
+                array_column($test_participants, 'usr_id')
+            );
+
+        return array_filter(
+            $test_participants,
+            static fn(array $participant): bool => in_array($participant['usr_id'], $allowed_user_ids, true)
+        );
+    }
 }