Merge branch 'master' into mickey/use_new_release_endpoints

metacpan · Jul 5, 2017 · 9278f86 · 9278f86
2 parents e197523 + edcbaa6
commit 9278f86
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 68 deletions.
diff --git a/lib/MetaCPAN/Web/Controller/Recent.pm b/lib/MetaCPAN/Web/Controller/Recent.pm
@@ -21,7 +21,7 @@ sub index : Path : Args(0) {
         {
             recent    => $data->{releases},
             took      => $data->{took},
-            total     => $data->{hits}->{total},
+            total     => $data->{total},
             template  => 'recent.html',
             page_size => $page_size,
         }

diff --git a/lib/MetaCPAN/Web/Controller/Recent/TopUploaders.pm b/lib/MetaCPAN/Web/Controller/Recent/TopUploaders.pm
@@ -33,13 +33,10 @@ sub topuploaders : Private {
     $c->stash(
         {
             authors => [
-                sort { $b->{releases} <=> $a->{releases} } map {
-                    {
-                        %{ $_->{_source} },
-                            releases =>
-                            $data->{counts}{ $_->{_source}->{pauseid} }
-                    }
-                } @{ $authors->{hits}{hits} }
+                sort { $b->{releases} <=> $a->{releases} }
+                    map +{ %{$_},
+                    releases => $data->{counts}{ $_->{pauseid} } },
+                @{ $authors->{authors} }
             ],
             took     => $data->{took},
             total    => $data->{total},

diff --git a/lib/MetaCPAN/Web/Model/API/Author.pm b/lib/MetaCPAN/Web/Model/API/Author.pm
@@ -32,18 +32,7 @@ sub get {
     return $self->request( '/author/' . uc( $author[0] ) )
         if ( @author == 1 );
 
-    return $self->request(
-        '/author/_search',
-        {
-            query => {
-                constant_score => {
-                    filter => { ids => { values => [ map {uc} @author ] } }
-                }
-            },
-            size => scalar @author,
-        }
-    );
-
+    return $self->request( '/author/by_ids', { id => \@author } );
 }
 
 sub search {

diff --git a/lib/MetaCPAN/Web/Model/API/Favorite.pm b/lib/MetaCPAN/Web/Model/API/Favorite.pm
@@ -17,54 +17,8 @@ sub get {
         return Future->wrap( {} );
     }
 
-    return $self->request(
-        '/favorite/_search',
-        {
-            size  => 0,
-            query => {
-                terms => { 'distribution' => \@distributions }
-            },
-            aggregations => {
-                favorites => {
-                    terms => {
-                        field => 'distribution',
-                        size  => scalar @distributions,
-                    },
-                },
-                $user
-                ? (
-                    myfavorites => {
-                        filter       => { term => { 'user' => $user } },
-                        aggregations => {
-                            enteries => {
-                                terms => { field => 'distribution' }
-                            }
-                        }
-                    }
-                    )
-                : (),
-            }
-        }
-        )->transform(
-        done => sub {
-            my $data = shift;
-            return {
-                took      => $data->{took},
-                favorites => {
-                    map { $_->{key} => $_->{doc_count} }
-                        @{ $data->{aggregations}->{favorites}->{buckets} }
-                },
-                myfavorites => $user
-                ? {
-                    map { $_->{key} => $_->{doc_count} } @{
-                        $data->{aggregations}->{myfavorites}->{entries}
-                            ->{buckets}
-                    }
-                    }
-                : {},
-            };
-        }
-        );
+    return $self->request( '/favorite/agg_by_distributions',
+        { user => $user, distribution => \@distributions } );
 }
 
 sub by_user {