Skip to content

ETT-825 Operational bug: CRMS order-by #209

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
moseshll merged 2 commits into from
Nov 10, 2025
Merged

ETT-825 Operational bug: CRMS order-by #209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
17b0f8f
ETT-825 Operational bug: CRMS order-by
moseshll Nov 6, 2025
bc36f80
Formatting fix
moseshll Nov 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 13 additions & 11 deletions cgi/CRMS.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4784,8 +4784,6 @@ sub ProjectDispatch
}
}

# Code commented out with #### are race condition mitigations
# to be considered for a later release.
# Test param prints debug info and iterates 5 times to test mitigation.
# If the query returns no results CRMS errors will contain one entry.
# If there is a Bib API issue, CRMS errors will hold an error for each failed item.
Expand All @@ -4801,7 +4799,10 @@ sub GetNextItemForReview
my $proj = $self->GetUserCurrentProject($user);
my $project_ref = $self->GetProjectRef($proj);
my @params = ($user, $proj);
my @orders = ('q.priority DESC', 'cnt DESC', 'hash', 'q.time ASC');
my @critical_order = ('q.priority DESC', 'cnt DESC');
my @critical_order_params = ();
my @noncritical_order = ('hash', 'q.time ASC');
my @noncritical_order_params = ();
my $sysid;
if ($project_ref->group_volumes && $self->IsUserAdvanced($user)) {
$sql = 'SELECT b.sysid FROM reviews r INNER JOIN bibdata b ON r.id=b.id'.
Expand All @@ -4818,27 +4819,28 @@ sub GetNextItemForReview
$excludeh = ' AND NOT EXISTS (SELECT * FROM historicalreviews r3 WHERE r3.id=q.id AND r3.user IN '. $wc. ')';
push @params, @{$inc};
}
# The `PresentationOrder` interface is not rich enough to support wildcard parameters
# but if it were then we would want to unshift them on `@noncritical_order_params`
# the way we do below with sysid.
if (defined $porder) {
unshift @orders, $porder;
unshift @noncritical_order, $porder;
}
if (defined $sysid) {
# First order, last param (assumes any order param will be last).
# Adding any additional parameterized ordering will be trickier.
unshift @orders, 'IF(b.sysid=?,1,0) DESC,q.id ASC';
push @params, $sysid;
unshift @noncritical_order, 'IF(b.sysid=?,1,0) DESC,q.id ASC';
unshift @noncritical_order_params, $sysid;
}
$sql = 'SELECT q.id,(SELECT COUNT(*) FROM reviews r WHERE r.id=q.id) AS cnt,'.
'SHA2(CONCAT(?,q.id),0) AS hash,q.priority,q.project,b.sysid'.
' FROM queue q INNER JOIN bibdata b ON q.id=b.id'.
' WHERE q.project=? AND q.locked IS NULL AND q.status<2'.
' AND q.unavailable=0'.
$excludei. $excludeh.
' HAVING cnt<2 ORDER BY '. join ',', @orders;
' HAVING cnt<2 ORDER BY '. join ',', (@critical_order, @noncritical_order);
if (defined $test) {
$sql .= ' LIMIT 5';
printf "$user: %s\n", Utilities::StringifySql($sql, @params);
printf "$user: %s\n", Utilities::StringifySql($sql, @params, @critical_order_params, @noncritical_order_params);
}
$ref = $self->SelectAll($sql, @params);
$ref = $self->SelectAll($sql, @params, @critical_order_params, @noncritical_order_params);
}; # eval
# Deal with error with database query setup or execution.
if ($@) {
Expand Down
18 changes: 18 additions & 0 deletions t/CRMS.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,24 @@ subtest '#UpdateMetadata' => sub {
delete $ENV{CRMS_METADATA_FIXTURES_PATH};
};

subtest 'GetNextItemForReview' => sub {
$ENV{CRMS_METADATA_FIXTURES_PATH} = $ENV{'SDRROOT'} . '/crms/t/fixtures/metadata';
my $htid = 'coo.31924000029250';
my $record = Metadata->new('id' => $htid);
$crms->UpdateMetadata($htid, 1, $record);
$crms->PrepareSubmitSql('INSERT INTO queue (id,project) VALUES (?,?)', $htid, 1);
# Assign autocrms to this project
$crms->PrepareSubmitSql('INSERT INTO projectusers (project,user) VALUES (?,?)', 1, 'autocrms');
$crms->PrepareSubmitSql('UPDATE users SET project=1 WHERE id=?', 'autocrms');
$crms->ClearErrors;
my $next_volume = $crms->GetNextItemForReview('autocrms');
is($next_volume, $htid, 'expected volume is returned');
$crms->PrepareSubmitSql('DELETE FROM projectusers');
$crms->PrepareSubmitSql('DELETE FROM queue');
$crms->PrepareSubmitSql('DELETE FROM bibdata');
delete $ENV{CRMS_METADATA_FIXTURES_PATH};
};

subtest '#LinkToJira' => sub {
is($crms->LinkToJira('DEV-000'),
'<a href="https://hathitrust.atlassian.net/browse/DEV-000" target="_blank">DEV-000</a>');
Expand Down