Skip to content

Commit

Permalink
pkp#10480 Fix incorrect data in stage property
Browse files Browse the repository at this point in the history
  • Loading branch information
@Vitaliy-1
Vitaliy-1 committed Jan 19, 2025
1 parent 1a224de commit 4fdcf1d
Show file tree
Hide file tree
Showing 2 changed files with 74 additions and 86 deletions.
157 changes: 71 additions & 86 deletions classes/submission/maps/Schema.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ public function map(
$this->genres = $genres;
$this->userRoles = $userRoles;
$this->reviewAssignments = $reviewAssignments ?? Repo::reviewAssignment()->getCollector()->filterBySubmissionIds([$item->getId()])->getMany()->remember();
$this->stageAssignments = $stageAssignments ?? $this->getStageAssignmentsBySubmissions(collect([$item]), [Role::ROLE_ID_MANAGER, Role::ROLE_ID_SUB_EDITOR]);
$this->stageAssignments = $stageAssignments ?? $this->getStageAssignmentsBySubmissions(collect([$item]));
$this->decisions = $decisions ?? Repo::decision()->getCollector()->filterBySubmissionIds([$item->getId()])->getMany()->remember();

return $this->mapByProperties($this->getProps(), $item, $anonymizeReviews);
Expand Down Expand Up @@ -165,7 +165,7 @@ public function summarize(
$this->userGroups = $userGroups;
$this->genres = $genres;
$this->reviewAssignments = $reviewAssignments ?? Repo::reviewAssignment()->getCollector()->filterBySubmissionIds([$item->getId()])->getMany()->remember();
$this->stageAssignments = $stageAssignments ?? $this->getStageAssignmentsBySubmissions(collect([$item]), [Role::ROLE_ID_MANAGER, Role::ROLE_ID_SUB_EDITOR]);
$this->stageAssignments = $stageAssignments ?? $this->getStageAssignmentsBySubmissions(collect([$item]));

return $this->mapByProperties($this->getSummaryProps(), $item, $anonymizeReviews);
}
Expand Down Expand Up @@ -236,7 +236,7 @@ public function summarizeMany(Enumerable $collection, Enumerable $userGroups, ar
$this->userGroups = $userGroups;
$this->genres = $genres;
$this->reviewAssignments = Repo::reviewAssignment()->getCollector()->filterBySubmissionIds($collection->keys()->toArray())->getMany()->remember();
$this->stageAssignments = $this->getStageAssignmentsBySubmissions($collection, [Role::ROLE_ID_MANAGER, Role::ROLE_ID_SUB_EDITOR]);
$this->stageAssignments = $this->getStageAssignmentsBySubmissions($collection);

$associatedReviewAssignments = $this->reviewAssignments->groupBy(
fn (ReviewAssignment $reviewAssignment, int $key) =>
Expand Down Expand Up @@ -408,10 +408,17 @@ protected function mapByProperties(array $props, Submission $submission, bool|Co
$output[$prop] = Repo::submission()->getUrlApi($this->context, $submission->getId());
break;
case 'availableEditorialDecisions':
$output[$prop] = collect(Application::get()->getApplicationStages())->mapWithKeys(function (int $stageId) use ($submission) {
$availableEditorialDecisions = $this->getAvailableEditorialDecisions($stageId, $submission);
return [$stageId => array_map(fn (DecisionType $decisionType) => ['id' => $decisionType->getDecision(), 'label' => $decisionType->getLabel()], $availableEditorialDecisions)];
})->values()->all();
$output[$prop] = collect($this->getAvailableEditorialDecisions(
$submission->getData('stageId'),
$submission
))->map(
fn (DecisionType $decisionType) =>
[
'stageId' => $submission->getData('stageId'),
'id' => $decisionType->getDecision(),
'label' => $decisionType->getLabel(),
]
)->toArray();
break;
case 'canCurrentUserChangeMetadata':
// Identify if current user can change metadata. Consider roles in the active stage.
Expand Down Expand Up @@ -595,58 +602,44 @@ protected function getPropertyStages(Enumerable $stageAssignments, Submission $s

// values false by default, to be determined later
'editorAssigned' => false,
'isDecidingEditorAssigned' => false,
'isCurrentUserDecidingEditor' => false,
'currentUserAssignedRoles' => [],
];
}

$recommendations = [];
$isAssignedInAnyRole = false; // Determine if the current user is assigned to the submission in any role
$hasDecidingEditor = false;
$hasRecommendingEditors = false;
$isCurrentUserDecidingEditor = false;

// Determine stage assignment related data
foreach ($stageAssignments as $stageAssignment) {

// Record recommendations for review stages
if ($stageAssignment->recommendOnly) {
if (!$hasRecommendingEditors) {
$hasRecommendingEditors = true;
}
}

$userGroup = $stageAssignment->userGroup; /** @var UserGroup $userGroup */

foreach ($userGroup->userGroupStages as $groupStage) { /** @var UserGroupStage $groupStage */
// Identify the first user with the editor
if (
!$stages[$groupStage->stageId]['editorAssigned'] &&
in_array(
$userGroup->roleId,
[Role::ROLE_ID_MANAGER, Role::ROLE_ID_SUB_EDITOR]
)
in_array($userGroup->roleId, [Role::ROLE_ID_MANAGER, Role::ROLE_ID_SUB_EDITOR])
) {
$editorAssigned = $stages[$groupStage->stageId]['editorAssigned'] = true;
$stages[$groupStage->stageId]['editorAssigned'] = true;
}

// Identify the first user with the editor role and without recommend only flag
// Identify the first user with the editor role and with a recommend only flag
if (
!$stages[$groupStage->stageId]['isDecidingEditorAssigned'] &&
isset($editorAssigned) &&
!$hasDecidingEditor &&
in_array($userGroup->roleId, [Role::ROLE_ID_MANAGER, Role::ROLE_ID_SUB_EDITOR]) &&
!$stageAssignment->recommendOnly
) {
$isDecidingEditorAssigned = $stages[$groupStage->stageId]['isDecidingEditorAssigned'] = true;
}

// Record recommendations for review stages
if (
$stageAssignment->recommendOnly &&
isset($currentReviewRound) &&
isset($decisions) && $decisions->isNotEmpty()
) {
foreach ($decisions as $decision) {
if ($currentReviewRound->getId() != $decision->getData('reviewRoundId')) {
continue;
}

$decisionType = Repo::decision()->getDecisionType($decision->getData('decision'));
$recommendations[$decision->getId()] = [
'decision' => $decision->getData('decision'),
'label' => $decisionType->getLabel(),
'stageId' => $decision->getData('stageId'),
];
}
$hasDecidingEditor = true;
}

// Identify properties related to the current user
Expand All @@ -664,41 +657,13 @@ protected function getPropertyStages(Enumerable $stageAssignments, Submission $s
}
}

if (isset($isDecidingEditorAssigned)) {
$stages[$groupStage->stageId]['isCurrentUserDecidingEditor'] = true;
// Identify data associated with editorial roles
if (!in_array($userGroup->roleId, [Role::ROLE_ID_MANAGER, Role::ROLE_ID_SUB_EDITOR])) {
continue;
}

// Identify if the current user gave recommendation
if (
in_array($userGroup->roleId, [Role::ROLE_ID_MANAGER, Role::ROLE_ID_SUB_EDITOR]) && // this user is assigned as an editor
!isset($isDecidingEditorAssigned) && // this user only can give recommendations, isn't a deciding editor
in_array($groupStage->stageId, [WORKFLOW_STAGE_ID_EXTERNAL_REVIEW, WORKFLOW_STAGE_ID_INTERNAL_REVIEW]) &&
isset($decisions) && $decisions->isNotEmpty() // only for submissions list
) {
foreach ($decisions as $decision) {
if (isset($stages[$groupStage->stageId]['currentUserRecommendation'])) {
break; // Decision is already recorded, skip
}

if ($decision->getData('editorId') != $currentUser->getId()) {
continue;
}

if (!in_array($decision->getData('stageId'), [WORKFLOW_STAGE_ID_EXTERNAL_REVIEW, WORKFLOW_STAGE_ID_INTERNAL_REVIEW])) {
continue;
}

if ($currentReviewRound->getId() != $decision->getData('reviewRoundId')) {
continue;
}

$decision = $decision->getData('decision');
$decisionType = Repo::decision()->getDecisionType($decision);
$stages[$groupStage->stageId]['currentUserRecommendation'] = [
'decision' => $decision,
'label' => $decisionType->getLabel(),
];
}
if (!$stageAssignment->recommendOnly) {
$isCurrentUserDecidingEditor = $stages[$groupStage->stageId]['isCurrentUserDecidingEditor'] = true;
}

// if the user is assigned several times in the editorial role, and
Expand All @@ -722,25 +687,45 @@ protected function getPropertyStages(Enumerable $stageAssignments, Submission $s
}
}

// Set recommendation if current user is a deciding editor
foreach ($stages as $stageId => $stage) {
if (empty($recommendations)) {
break;
}
// Set recommendation related props
if (
isset($currentReviewRound) &&
isset($decisions) && $decisions->isNotEmpty()
) {
foreach ($decisions as $decision) {

if (!in_array($stageId, [WORKFLOW_STAGE_ID_EXTERNAL_REVIEW, WORKFLOW_STAGE_ID_INTERNAL_REVIEW])) {
continue;
}
// Get only recommendations
$decisionType = Repo::decision()->getDecisionType($decision->getData('decision'));
if (!Repo::decision()->isRecommendation($decisionType->getDecision())) {
continue;
}

if (!$stage['isCurrentUserDecidingEditor']) {
continue;
}
// Get only decisions related to the relevant review round
if ($currentReviewRound->getId() != $decision->getData('reviewRoundId')) {
continue;
}

foreach ($recommendations as $recommendationId => $recommendation) {
$stages[$recommendation['stageId']]['recommendations'][$recommendationId] = [
'decision' => $recommendation['decision'],
'label' => $recommendation['label'],
$recommendation = [
'decision' => $decision->getData('decision'),
'label' => $decisionType->getLabel(),
];

// Set recommendations for the deciding editor
if ($isCurrentUserDecidingEditor) {
$stages[$decision->getData('stageId')]['recommendations'][] = $recommendation;
}

// Set own recommendations of the current user
if ($currentUser == $decision->getData('editorId')) {
$stages[$decision->getData('stageId')]['currentUserRecommendation'] = $recommendation;
}
}
}

foreach ($stages as $stageId => $stage) {
// Determine if deciding editor is assigned
if ($hasDecidingEditor && $hasRecommendingEditors) {
$stages[$stageId]['isDecidingEditorAssigned'] = true;
}
}

Expand Down
3 changes: 3 additions & 0 deletions schemas/submission.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@
"items": {
"type": "object",
"properties": {
"stageId": {
"type": "integer"
},
"id": {
"type": "integer"
},
Expand Down

0 comments on commit 4fdcf1d

Please sign in to comment.