Merge pull request metabrainz#2096 from reosarevok/MBS-11650

MBS-11650: Add tag and rating statistics to profile page

Author: mwiencek

lib/MusicBrainz/Server/Controller/User.pm

@@ -447,6 +447,7 @@ sub profile : Chained('load') PathPart('') HiddenOnSlaves
     my $edit_stats = $c->model('Editor')->various_edit_counts($user->id);
     $edit_stats->{last_day_count} = $c->model('Editor')->last_24h_edit_count($user->id);
     my $added_entities = $c->model('Editor')->added_entities_counts($user->id);
+    my $secondary_stats = $c->model('Editor')->secondary_counts($user->id, $c->stash->{viewing_own_profile});
 
     my @ip_hashes;
     if ($c->user_exists && $c->user->is_account_admin && !(
@@ -465,6 +466,7 @@ sub profile : Chained('load') PathPart('') HiddenOnSlaves
         user            => $c->unsanitized_editor_json($user),
         votes           => $c->stash->{votes},
         addedEntities   => $added_entities,
+        secondaryStats  => $secondary_stats,
     );
 
     $c->stash(

lib/MusicBrainz/Server/Data/Editor.pm

@@ -714,6 +714,69 @@ sub added_entities_counts {
     return \%result;
 }
 
+sub secondary_counts {
+    my ($self, $editor_id, $viewing_own_profile) = @_;
+
+    my $editor = $self->get_by_id($editor_id);
+    $self->load_preferences($editor);
+
+    my %result;
+
+    if ($viewing_own_profile || $editor->preferences->public_tags) {
+        $result{upvoted_tag_count} = 0;
+        $result{downvoted_tag_count} = 0;
+
+        my @tag_tables = entities_with(
+            'tags',
+            take => sub { shift . '_tag_raw' },
+        );
+        my $tag_inner_query = join(
+            ' UNION ALL ',
+            map { "SELECT is_upvote FROM $_ WHERE editor = ?" } @tag_tables
+        );
+
+        my $query = <<~SQL;
+            SELECT x.is_upvote, count(*)
+            FROM ($tag_inner_query) x
+            GROUP BY x.is_upvote
+            SQL
+
+        my $rows = $self->sql->select_list_of_lists(
+            $query,
+            ($editor_id) x scalar @tag_tables,
+        );
+
+        for my $row (@$rows) {
+            my ($is_upvote, $count) = @$row;
+            if ($is_upvote) {
+                $result{upvoted_tag_count} = $count + 0;
+            } else {
+                $result{downvoted_tag_count} = $count + 0;
+            }
+        }
+  }
+
+    if ($viewing_own_profile || $editor->preferences->public_ratings) {
+        my @rating_tables = entities_with(
+            'ratings',
+            take => sub { shift . '_rating_raw' },
+        );
+        my $rating_inner_query = join(
+            ' UNION ALL ',
+            map { "SELECT 1 FROM $_ WHERE editor = ?" } @rating_tables
+        );
+
+        my $query = "SELECT count(*) FROM ($rating_inner_query) x";
+
+        $result{rating_count} = $self->sql->select_single_value(
+            $query,
+            ($editor_id) x scalar @rating_tables,
+        );
+    }
+
+    return \%result;
+}
+
 sub last_24h_edit_count
 {
     my ($self, $editor_id) = @_;

root/user/UserProfile.js

@@ -446,6 +446,12 @@ type EditStatsT = {
   +rejected_count: number,
 };
 
+type SecondaryStatsT = {
+  +downvoted_tag_count?: number,
+  +rating_count?: number,
+  +upvoted_tag_count?: number,
+};
+
 type VoteStatsT = Array<{
   +all: {
     +count: number,
@@ -477,6 +483,7 @@ type UserProfileStatisticsProps = {
   +$c: CatalystContextT,
   +addedEntities: EntitiesStatsT,
   +editStats: EditStatsT,
+  +secondaryStats: SecondaryStatsT,
   +user: UnsanitizedEditorT,
   +votes: VoteStatsT,
 };
@@ -486,6 +493,7 @@ const UserProfileStatistics = ({
   editStats,
   user,
   votes,
+  secondaryStats,
   addedEntities,
 }: UserProfileStatisticsProps) => {
   const voteTotals = votes.pop();
@@ -494,6 +502,11 @@ const UserProfileStatistics = ({
                           editStats.accepted_auto_count;
   const hasAddedEntities =
     Object.values(addedEntities).some((number) => number !== 0);
+  const hasPublicRatings = secondaryStats.rating_count != null;
+  const hasPublicTags = secondaryStats.upvoted_tag_count != null;
+  const ratingCount = secondaryStats.rating_count ?? 0;
+  const upvotedTagCount = secondaryStats.upvoted_tag_count ?? 0;
+  const downvotedTagCount = secondaryStats.downvoted_tag_count ?? 0;
 
   return (
     <>
@@ -679,7 +692,7 @@ const UserProfileStatistics = ({
               <abbr title={l('Newly applied edits may ' +
                              'need 24 hours to appear')}
               >
-                {exp.l('Added entities')}
+                {l('Added entities')}
               </abbr>
             </th>
           </tr>
@@ -709,6 +722,58 @@ const UserProfileStatistics = ({
           )}
         </tbody>
       </table>
+
+      {hasPublicTags || hasPublicRatings ? (
+        <table
+          className="statistics"
+          title={l('This table shows a summary ' +
+                  'of secondary data added by this editor.')}
+        >
+          <thead>
+            <tr>
+              <th colSpan="2">
+                {l('Tags and ratings')}
+              </th>
+            </tr>
+          </thead>
+          <tbody>
+            {hasPublicTags ? (
+              <>
+                <UserProfileProperty name={l('Tags upvoted')}>
+                  {$c.user && upvotedTagCount > 0 ? exp.l(
+                    '{count} ({view_url|view})',
+                    {
+                      count: formatCount($c, upvotedTagCount),
+                      view_url: `/user/${encodedName}/tags`,
+                    },
+                  ) : formatCount($c, upvotedTagCount)}
+                </UserProfileProperty>
+
+                <UserProfileProperty name={l('Tags downvoted')}>
+                  {$c.user && downvotedTagCount > 0 ? exp.l(
+                    '{count} ({view_url|view})',
+                    {
+                      count: formatCount($c, downvotedTagCount),
+                      view_url: `/user/${encodedName}/tags?show_downvoted=1`,
+                    },
+                  ) : formatCount($c, downvotedTagCount)}
+                </UserProfileProperty>
+              </>
+            ) : null}
+            {hasPublicRatings ? (
+              <UserProfileProperty name={l('Ratings')}>
+                {$c.user && ratingCount > 0 ? exp.l(
+                  '{count} ({view_url|view})',
+                  {
+                    count: formatCount($c, ratingCount),
+                    view_url: `/user/${encodedName}/ratings`,
+                  },
+                ) : formatCount($c, ratingCount)}
+              </UserProfileProperty>
+            ) : null}
+          </tbody>
+        </table>
+      ) : null}
     </>
   );
 };
@@ -718,6 +783,7 @@ type UserProfileProps = {
   +addedEntities: EntitiesStatsT,
   +editStats: EditStatsT,
   +ipHashes: $ReadOnlyArray<string>,
+  +secondaryStats: SecondaryStatsT,
   +subscribed: boolean,
   +subscriberCount: number,
   +user: UnsanitizedEditorT,
@@ -728,6 +794,7 @@ const UserProfile = ({
   $c,
   editStats,
   ipHashes,
+  secondaryStats,
   subscribed,
   subscriberCount,
   user,
@@ -755,6 +822,7 @@ const UserProfile = ({
         $c={$c}
         addedEntities={addedEntities}
         editStats={editStats}
+        secondaryStats={secondaryStats}
         user={user}
         votes={votes}
       />