X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=lib%2FGruntmaster%2FData.pm;h=4935e024d2920a8718de26d0d0092a1bee922e16;hb=c9311d506d661ee510d8609e8c4c56bf1079a94d;hp=59cd64b3cb1536a751d5bed74a106ba6678b7afd;hpb=59d291c001feac6118810de885a6b7b5989623bb;p=gruntmaster-data.git

diff --git a/lib/Gruntmaster/Data.pm b/lib/Gruntmaster/Data.pm
index 59cd64b..4935e02 100644
--- a/lib/Gruntmaster/Data.pm
+++ b/lib/Gruntmaster/Data.pm
@@ -42,12 +42,22 @@ BEGIN {
 }
 
 sub user_list {
-	my $rs = $_[0]->users->search(undef, {columns => USER_PUBLIC_COLUMNS, prefetch => [qw/problem_statuses contest_statuses/]} );
+	my ($self) = @_;
+	my $rs = $self->users->search(undef, {columns => USER_PUBLIC_COLUMNS} );
+	my (%solved, %attempted, %contests);
+
+	for my $row ($self->problem_statuses->all) {
+		$solved   {$row->rawowner}++ if     $row->solved;
+		$attempted{$row->rawowner}++ unless $row->solved;
+	}
+	$contests{$_->rawowner}++ for $self->contest_statuses->all;
+
 	[ sort { $b->{solved} <=> $a->{solved} or $b->{attempted} <=> $a->{attempted} } map { ## no critic (ProhibitReverseSort)
-		my $solved    = $_->problem_statuses->count({solved => 1});
-		my $attempted = $_->problem_statuses->count({solved => 0});
-		my $contests  = $_->contest_statuses->count;
-		+{ $_->get_columns, solved => $solved, attempted => $attempted, contests => $contests }
+		my $id = $_->id;
+		+{ $_->get_columns,
+		   solved => ($solved{$id} // 0),
+		   attempted => ($attempted{$id} // 0),
+		   contests => ($contests{$id} // 0) }
 	} $rs->all ]
 }