Use new /author/by_user API endpoint

This will make use of the new API endpoint to make the WEB code cleaner and less Elasticsearch-aware.
metacpan · May 31, 2017 · 15c9d0b · 15c9d0b
1 parent aab539f
commit 15c9d0b
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 18 deletions.
diff --git a/lib/MetaCPAN/Web/Controller/Favorite.pm b/lib/MetaCPAN/Web/Controller/Favorite.pm
@@ -12,17 +12,12 @@ sub recent : Local : Args(0) {
     my @faves    = map { $_->{_source} } @{ $data->{hits}->{hits} };
     my @user_ids = map { $_->{user} } @faves;
 
-    my $authors
-        = $c->model('API::Author')->by_user( \@user_ids )->recv->{hits}
-        ->{hits};
-
-    my %author_for_user_id
-        = map { $_->{fields}->{user} => $_->{fields}->{pauseid} } @{$authors};
+    my $authors = $c->model('API::Author')->by_user( \@user_ids );
+    my %author_for_user_id = map { $_->{user} => $_->{pauseid} } @{$authors};
 
     foreach my $fave (@faves) {
-        if ( exists $author_for_user_id{ $fave->{user} } ) {
-            $fave->{clicked_by_author} = $author_for_user_id{ $fave->{user} };
-        }
+        next unless exists $author_for_user_id{ $fave->{user} };
+        $fave->{clicked_by_author} = $author_for_user_id{ $fave->{user} };
     }
 
     $c->stash(

diff --git a/lib/MetaCPAN/Web/Model/API/Author.pm b/lib/MetaCPAN/Web/Model/API/Author.pm
@@ -3,6 +3,8 @@ package MetaCPAN::Web::Model::API::Author;
 use Moose;
 use namespace::autoclean;
 
+use Ref::Util qw( is_arrayref );
+
 extends 'MetaCPAN::Web::Model::API';
 
 =head1 NAME
@@ -94,15 +96,20 @@ sub search {
 
 sub by_user {
     my ( $self, $users ) = @_;
-
-    my $query = return $self->request(
-        '/author/_search',
-        {
-            query  => { terms => { user => $users } },
-            fields => [qw(user pauseid)],
-            size   => 100
-        }
-    );
+    return [] unless $users;
+
+    my $ret;
+    if ( is_arrayref($users) ) {
+        return unless @{$users};
+        $ret = $self->request( '/author/by_user', undef, { user => $users } );
+    }
+    else {
+        $ret = $self->request("/author/by_user/$users");
+    }
+    return unless $ret;
+
+    my $data = $ret->recv;
+    return ( exists $data->{authors} ? $data->{authors} : [] );
 }
 
 __PACKAGE__->meta->make_immutable;