MBS-13770: Allow admins to auto-approve and auto-reject any edit

lib/MusicBrainz/Server/Constants.pm

@@ -341,10 +341,12 @@ Readonly our $SCRIPT_FREQUENCY_UNCOMMON =>  2;
 Readonly our $SCRIPT_FREQUENCY_OTHER    =>  3;
 Readonly our $SCRIPT_FREQUENCY_FREQUENT =>  4;
 
-Readonly our $VOTE_ABSTAIN => -1;
-Readonly our $VOTE_NO      =>  0;
-Readonly our $VOTE_YES     =>  1;
-Readonly our $VOTE_APPROVE =>  2;
+Readonly our $VOTE_ABSTAIN          => -1;
+Readonly our $VOTE_NO               =>  0;
+Readonly our $VOTE_YES              =>  1;
+Readonly our $VOTE_APPROVE          =>  2;
+Readonly our $VOTE_ADMIN_APPROVE    =>  3;
+Readonly our $VOTE_ADMIN_REJECT     =>  4;
 
 Readonly our $STATUS_OPEN         => 1;
 Readonly our $STATUS_APPLIED      => 2;

lib/MusicBrainz/Server/Controller/Admin.pm

@@ -7,7 +7,13 @@ use Try::Tiny;
 
 extends 'MusicBrainz::Server::Controller';
 
-use MusicBrainz::Server::Constants qw( :privileges );
+use DBDefs;
+
+use MusicBrainz::Server::Constants qw(
+    :privileges
+    $VOTE_ADMIN_APPROVE
+    $VOTE_ADMIN_REJECT
+);
 use MusicBrainz::Server::ControllerUtils::JSON qw( serialize_pager );
 use MusicBrainz::Server::Data::Utils qw( boolean_to_json );
 
@@ -340,6 +346,63 @@ sub unlock_username : Path('/admin/locked-usernames/unlock') Args(1) RequireAuth
     );
 }
 
+sub accept_edit : Path('/admin/accept-edit') Args(1) RequireAuth(account_admin)
+{
+    my ($self, $c, $edit_id) = @_;
+
+    my $edit = $c->model('Edit')->get_by_id($edit_id)
+        or $c->detach('/error_404');
+
+    _accept_edit($c, $edit) if $edit->is_open;
+    $c->response->redirect($c->uri_for_action('/edit/show', [ $edit->id ]));
+}
+
+sub reject_edit : Path('/admin/reject-edit') Args(1) RequireAuth(account_admin)
+{
+    my ($self, $c, $edit_id) = @_;
+
+    my $edit = $c->model('Edit')->get_by_id($edit_id)
+        or $c->detach('/error_404');
+
+    _reject_edit($c, $edit) if $edit->is_open;
+    $c->response->redirect($c->uri_for_action('/edit/show', [ $edit->id ]));
+}
+
+sub _accept_edit
+{
+    my ($c, $edit) = @_;
+
+    my $sql = $c->model('MB')->context->sql;
+
+    Sql::run_in_transaction( sub {
+        $c->model('Vote')->enter_votes(
+            $c->user,
+            [{
+                vote    => $VOTE_ADMIN_APPROVE,
+                edit_id => $edit->id,
+            }],
+        );
+        $c->model('Edit')->accept($edit);
+    }, $sql );
+}
+
+sub _reject_edit
+{
+    my ($c, $edit) = @_;
+
+    my $sql = $c->model('MB')->context->sql;
+    Sql::run_in_transaction( sub {
+        $c->model('Vote')->enter_votes(
+            $c->user,
+            [{
+                vote    => $VOTE_ADMIN_REJECT,
+                edit_id => $edit->id,
+            }],
+        );
+        $c->model('Edit')->reject($edit);
+    }, $sql );
+}
+
 1;
 
 =head1 COPYRIGHT AND LICENSE

lib/MusicBrainz/Server/Controller/User/Edits.pm

@@ -350,6 +350,8 @@ sub votes : Chained('/user/load') PathPart('votes') RequireAuth HiddenOnMirrors
         'conditions.0.args.1' => $VOTE_NO,
         'conditions.0.args.2' => $VOTE_YES,
         'conditions.0.args.3' => $VOTE_APPROVE,
+        'conditions.0.args.4' => $VOTE_ADMIN_APPROVE,
+        'conditions.0.args.5' => $VOTE_ADMIN_REJECT,
     };
 
     $c->stash(

lib/MusicBrainz/Server/Data/Edit.pm

@@ -932,8 +932,13 @@ sub insert_votes_and_notes {
     my @votes = @{ $data{votes} || [] };
     my @notes = @{ $data{notes} || [] };
 
-    # Filter out approvals, they can only be entered via the approve method
-    @votes = grep { $_->{vote} != $VOTE_APPROVE } @votes;
+    # Filter out approvals (they can only be entered via the approve method)
+    # and admin votes (they too have their own separate mechanisms)
+    @votes = grep {
+        $_->{vote} != $VOTE_APPROVE &&
+        $_->{vote} != $VOTE_ADMIN_APPROVE &&
+        $_->{vote} != $VOTE_ADMIN_REJECT
+    } @votes;
 
     Sql::run_in_transaction(sub {
         $self->c->model('Vote')->enter_votes($editor, \@votes);

lib/MusicBrainz/Server/Data/Statistics.pm

@@ -1553,10 +1553,12 @@ my %stats = (
             my %dist = map { @$_ } @$data;
 
             +{
-                'count.vote.yes'        => $dist{$VOTE_YES} || 0,
-                'count.vote.no'         => $dist{$VOTE_NO}  || 0,
-                'count.vote.abstain'    => $dist{$VOTE_ABSTAIN} || 0,
-                'count.vote.approve'    => $dist{$VOTE_APPROVE} || 0,
+                'count.vote.yes'            => $dist{$VOTE_YES} || 0,
+                'count.vote.no'             => $dist{$VOTE_NO}  || 0,
+                'count.vote.abstain'        => $dist{$VOTE_ABSTAIN} || 0,
+                'count.vote.approve'        => $dist{$VOTE_APPROVE} || 0,
+                'count.vote.admin_approve'  => $dist{$VOTE_ADMIN_APPROVE} || 0,
+                'count.vote.admin_reject'   => $dist{$VOTE_ADMIN_REJECT} || 0,
             };
         },
         NONREPLICATED => 1,
@@ -1579,6 +1581,18 @@ my %stats = (
         PREREQ_ONLY => 1,
         NONREPLICATED => 1,
     },
+    'count.vote.admin_approve' => {
+        DESC => 'Count of admin approvals',
+        PREREQ => [qw[ count.vote.yes ]],
+        PREREQ_ONLY => 1,
+        NONREPLICATED => 1,
+    },
+    'count.vote.admin_reject' => {
+        DESC => 'Count of admin rejections',
+        PREREQ => [qw[ count.vote.yes ]],
+        PREREQ_ONLY => 1,
+        NONREPLICATED => 1,
+    },
     'count.vote.perday' => {
         DESC => 'Count of votes per day',
         SQL => q{SELECT count(id) FROM vote

lib/MusicBrainz/Server/Data/Vote.pm

@@ -2,7 +2,7 @@ package MusicBrainz::Server::Data::Vote;
 use Moose;
 use namespace::autoclean;
 
-use List::AllUtils qw( any sum );
+use List::AllUtils qw( sum );
 use Carp qw( confess );
 use MusicBrainz::Server::Data::Utils qw( map_query placeholders );
 use MusicBrainz::Server::Email;
@@ -69,13 +69,27 @@ sub enter_votes
         my @edit_ids = map { $_->{edit_id} } @votes;
         my $edits = $self->c->model('Edit')->get_by_ids(@edit_ids);
         @votes = grep { defined $edits->{ $_->{edit_id} } } @votes;
-        if (any { $_->{vote} == $VOTE_APPROVE && !$edits->{ $_->{edit_id} }->editor_may_approve($editor) } @votes) {
-            # not sufficient to filter the vote because the actual approval is happening elsewhere
-            confess 'Unauthorized editor ' . $editor->id . ' tried to approve edit #' . $_->{edit_id};
+        for my $vote (@votes) {
+            my $edit_id = $vote->{edit_id};
+            if ($vote->{vote} == $VOTE_APPROVE && !$edits->{ $edit_id }->editor_may_approve($editor)) {
+                # not sufficient to filter the vote because the actual approval is happening elsewhere
+                confess 'Unauthorized editor ' . $editor->id . ' tried to approve edit #' . $edit_id;
+            }
+            if ($vote->{vote} == $VOTE_ADMIN_APPROVE && !$editor->is_account_admin) {
+                # not sufficient to filter the vote because the actual approval is happening elsewhere
+                confess 'Unauthorized editor ' . $editor->id . ' tried to admin-approve edit #' . $edit_id;
+            }
+            if ($vote->{vote} == $VOTE_ADMIN_REJECT && !$editor->is_account_admin) {
+                # not sufficient to filter the vote because the actual rejection is happening elsewhere
+                confess 'Unauthorized editor ' . $editor->id . ' tried to admin-reject edit #' . $edit_id;
+            }
         }
         unless ($opts{override_privs}) {
             @votes = grep {
-                $_->{vote} == $VOTE_APPROVE || $edits->{ $_->{edit_id} }->editor_may_vote_on_edit($editor)
+                $_->{vote} == $VOTE_APPROVE ||
+                $_->{vote} == $VOTE_ADMIN_APPROVE ||
+                $_->{vote} == $VOTE_ADMIN_REJECT ||
+                $edits->{ $_->{edit_id} }->editor_may_vote_on_edit($editor)
             } @votes;
         }
 
@@ -169,6 +183,12 @@ sub editor_statistics
             ? $self->summarize_votes($VOTE_APPROVE, $all_votes, $recent_votes)
             : (),
 
+        # Show admin votes only if editor is an admin
+        $editor->is_account_admin ? (
+            $self->summarize_votes($VOTE_ADMIN_APPROVE, $all_votes, $recent_votes),
+            $self->summarize_votes($VOTE_ADMIN_REJECT, $all_votes, $recent_votes),
+        ) : (),
+
         # Add totals
         {
             name => l('Total'),
@@ -190,6 +210,8 @@ sub summarize_votes
         $VOTE_NO => lp('No', 'vote'),
         $VOTE_YES => lp('Yes', 'vote'),
         $VOTE_APPROVE => lp('Approve', 'vote'),
+        $VOTE_ADMIN_APPROVE => lp('Admin approval', 'vote'),
+        $VOTE_ADMIN_REJECT => lp('Admin rejection', 'vote'),
     );
 
     return (

lib/MusicBrainz/Server/Entity/Vote.pm

@@ -51,6 +51,8 @@ sub vote_name
         $VOTE_NO => 'No',
         $VOTE_YES => 'Yes',
         $VOTE_APPROVE => 'Approve',
+        $VOTE_ADMIN_APPROVE => 'Admin approval',
+        $VOTE_ADMIN_REJECT => 'Admin rejection',
     );
     return $names{$self->vote};
 }

lib/MusicBrainz/Server/Types.pm

@@ -48,7 +48,7 @@ subtype AutoEditorElectionStatus,
 
 subtype VoteOption,
     as Int,
-    where { $_ >= $VOTE_ABSTAIN && $_ <= $VOTE_APPROVE };
+    where { $_ >= $VOTE_ABSTAIN && $_ <= $VOTE_ADMIN_REJECT };
 
 subtype EditStatus,
     as Int,

root/constants.js

@@ -49,6 +49,8 @@ export const EDIT_VOTE_ABSTAIN = -1;
 export const EDIT_VOTE_NO = 0;
 export const EDIT_VOTE_YES = 1;
 export const EDIT_VOTE_APPROVE = 2;
+export const EDIT_VOTE_ADMIN_APPROVE = 3;
+export const EDIT_VOTE_ADMIN_REJECT = 4;
 
 export const QUALITY_UNKNOWN = -1;
 export const QUALITY_UNKNOWN_MAPPED = 1;

root/edit/EditIndex.js

@@ -16,6 +16,8 @@ import EditLink from '../static/scripts/common/components/EditLink.js';
 import EditorLink from '../static/scripts/common/components/EditorLink.js';
 import DBDefs from '../static/scripts/common/DBDefs.mjs';
 import linkedEntities from '../static/scripts/common/linkedEntities.mjs';
+import {isAccountAdmin}
+  from '../static/scripts/common/utility/privileges.js';
 import FormSubmit from '../static/scripts/edit/components/FormSubmit.js';
 import getVoteName from '../static/scripts/edit/utility/getVoteName.js';
 import {editorMayAddNote, editorMayVoteOnEdit}
@@ -35,10 +37,12 @@ component EditIndex(
   fullWidth: boolean = false,
 ) {
   const $c = React.useContext(CatalystContext);
+  const isAdmin = isAccountAdmin($c.user);
   const canAddNote = Boolean($c.user && editorMayAddNote(edit, $c.user));
   const isOwnEdit = Boolean($c.user && $c.user.id === edit.editor_id);
   const canVoteHere = Boolean($c.user && editorMayVoteOnEdit(edit, $c.user));
   const detailsElement = getEditDetailsElement(edit);
+  const showAcceptReject = DBDefs.DB_STAGING_TESTING_FEATURES || isAdmin;
 
   return (
     <Layout fullWidth={fullWidth} title={texp.l('Edit #{id}', {id: edit.id})}>
@@ -122,26 +126,44 @@ component EditIndex(
           ) : null}
 
           {$c.user ? (
-            edit.is_open && DBDefs.DB_STAGING_TESTING_FEATURES ? (
-              <>
-                <h2>{l('Testing features')}</h2>
-                <p>
-                  {l(`To aid in testing, the following features
-                      have been made available on testing servers:`)}
-                </p>
-                <ul>
-                  <li>
-                    <a href={'/test/accept-edit/' + edit.id}>
-                      {l('Accept edit')}
-                    </a>
-                  </li>
-                  <li>
-                    <a href={'/test/reject-edit/' + edit.id}>
-                      {l('Reject edit')}
-                    </a>
-                  </li>
-                </ul>
-              </>
+            edit.is_open && showAcceptReject ? (
+              isAdmin ? (
+                <>
+                  <h2>{l_admin('Admin features')}</h2>
+                  <ul>
+                    <li>
+                      <a href={'/admin/accept-edit/' + edit.id}>
+                        {l('Accept edit')}
+                      </a>
+                    </li>
+                    <li>
+                      <a href={'/admin/reject-edit/' + edit.id}>
+                        {l('Reject edit')}
+                      </a>
+                    </li>
+                  </ul>
+                </>
+              ) : (
+                <>
+                  <h2>{l('Testing features')}</h2>
+                  <p>
+                    {l(`To aid in testing, the following features
+                        have been made available on testing servers:`)}
+                  </p>
+                  <ul>
+                    <li>
+                      <a href={'/test/accept-edit/' + edit.id}>
+                        {l('Accept edit')}
+                      </a>
+                    </li>
+                    <li>
+                      <a href={'/test/reject-edit/' + edit.id}>
+                        {l('Reject edit')}
+                      </a>
+                    </li>
+                  </ul>
+                </>
+              )
             ) : null
           ) : (
             <p>

root/edit/components/EditHeader.js

@@ -12,7 +12,7 @@ import * as React from 'react';
 import RequestLogin from '../../components/RequestLogin.js';
 import SubHeader from '../../components/SubHeader.js';
 import VotingPeriod from '../../components/VotingPeriod.js';
-import {EDIT_VOTE_APPROVE} from '../../constants.js';
+import {EDIT_VOTE_ADMIN_APPROVE, EDIT_VOTE_APPROVE} from '../../constants.js';
 import {CatalystContext} from '../../context.mjs';
 import EditLink from '../../static/scripts/common/components/EditLink.js';
 import EditorLink from '../../static/scripts/common/components/EditorLink.js';
@@ -62,7 +62,8 @@ component EditHeader(
     ? getVoteName(latestVoteForVoter.vote)
     : null;
   const editWasApproved = !edit.is_open && edit.votes.some(
-    (vote) => vote.vote === EDIT_VOTE_APPROVE,
+    (vote) => (vote.vote === EDIT_VOTE_APPROVE ||
+               vote.vote === EDIT_VOTE_ADMIN_APPROVE),
   );
   const showVoteTally = latestVoteForEditor || isEditEditor || !edit.is_open;
 

root/edit/components/EditNote.js

@@ -10,6 +10,8 @@
 import * as React from 'react';
 
 import {
+  EDIT_VOTE_ADMIN_APPROVE,
+  EDIT_VOTE_ADMIN_REJECT,
   EDIT_VOTE_APPROVE,
   EDIT_VOTE_NO,
   EDIT_VOTE_YES,
@@ -20,6 +22,7 @@ import EditorLink from '../../static/scripts/common/components/EditorLink.js';
 import bracketed from '../../static/scripts/common/utility/bracketed.js';
 import {isAccountAdmin, isAddingNotesDisabled}
   from '../../static/scripts/common/utility/privileges.js';
+import {kebabCase} from '../../static/scripts/common/utility/strings.js';
 import getVoteName from '../../static/scripts/edit/utility/getVoteName.js';
 import formatUserDate from '../../utility/formatUserDate.js';
 import parseIsoDate from '../../utility/parseIsoDate.js';
@@ -34,7 +37,7 @@ function returnVoteClass(vote: ?VoteT, isOwner: boolean) {
   let className = '';
 
   if (vote) {
-    className = getVoteName(vote.vote);
+    className = kebabCase(getVoteName(vote.vote));
   }
 
   if (isOwner) {
@@ -68,7 +71,9 @@ component EditNote(
   ));
   const showVotingIcon = lastRelevantVote && (
     lastRelevantVote.vote === EDIT_VOTE_APPROVE ||
+    lastRelevantVote.vote === EDIT_VOTE_ADMIN_APPROVE ||
     lastRelevantVote.vote === EDIT_VOTE_NO ||
+    lastRelevantVote.vote === EDIT_VOTE_ADMIN_REJECT ||
     lastRelevantVote.vote === EDIT_VOTE_YES
   );