#12009 Normalize API response and fix reviewer user group name

Author: Vitaliy-1

api/v1/submissions/tasks/EditorialTaskController.php

@@ -669,15 +669,19 @@ public function getParticipants(Request $illuminateRequest): JsonResponse
             'isResponsible' => false,
         ]));
 
-        return response()->json([
-            'participants' => EditorialTaskParticipantResource::collection(resource: $resource, data: [
-                'submission' => $submission,
-                'stageAssignments' => $stageAssignments,
-                'reviewAssignments' => $reviewAssignments,
-                'users' => $users,
-                'userGroups' => $userGroups,
-            ]),
-        ], Response::HTTP_OK);
+        return response()->json(
+            EditorialTaskParticipantResource::collection(
+                resource: $resource,
+                data: [
+                    'submission' => $submission,
+                    'stageAssignments' => $stageAssignments,
+                    'reviewAssignments' => $reviewAssignments,
+                    'users' => $users,
+                    'userGroups' => $userGroups,
+                ]
+            ),
+            Response::HTTP_OK
+        );
     }
 
     /**
@@ -694,16 +698,17 @@ public function getReviewers(Submission $submission, int $stageId, array $curren
 
         // Filter review assignments by latest review round by reviewer
         $filteredReviewAssignments = [];
-        foreach ($reviewAssignments as $reviewAssignment) {
+        foreach ($reviewAssignments as $reviewAssignment) { /** @var ReviewAssignment $reviewAssignment */
+            $reviewerId = $reviewAssignment->getReviewerId();
 
-            if (!array_key_exists($reviewAssignment->reviewerId, $filteredReviewAssignments)) {
-                $filteredReviewAssignments[$reviewAssignment->reviewerId] = $reviewAssignment;
+            if (!array_key_exists($reviewerId, $filteredReviewAssignments)) {
+                $filteredReviewAssignments[$reviewerId] = $reviewAssignment;
                 continue;
             }
 
             // Compare review rounds, keep the latest one
-            if ($reviewAssignment->reviewRound > $filteredReviewAssignments[$reviewAssignment->reviewerId]->reviewRound) {
-                $filteredReviewAssignments[$reviewAssignment->reviewerId] = $reviewAssignment;
+            if ($reviewAssignment->getReviewRoundId() > $filteredReviewAssignments[$reviewerId]->getReviewRoundId()) {
+                $filteredReviewAssignments[$reviewerId] = $reviewAssignment;
             }
         }
 

api/v1/submissions/tasks/resources/EditorialTaskParticipantResource.php

@@ -52,8 +52,7 @@ public function toArray(Request $request, array $data = []): array
             if (
                 $reviewAssignments->isNotEmpty() &&
                 $userGroup->roleId === Role::ROLE_ID_REVIEWER &&
-                array_key_exists(Role::ROLE_ID_REVIEWER, $roles) &&
-                !is_null($reviewerRoleName)
+                is_null($reviewerRoleName)
             ) {
                 $reviewerRoleName = $userGroup->getLocalizedData('name');
             }