Merge pull request #717 from metacpan/mickey/controller_autocomplete_…

…refactor Controller/Autocomplete - move data handling to Document module
metacpan · Jul 10, 2017 · 2f74d54 · 2f74d54
2 parents 8df0a22 + 2a9d2f8
commit 2f74d54
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/lib/MetaCPAN/Document/File/Set.pm b/lib/MetaCPAN/Document/File/Set.pm
@@ -431,7 +431,7 @@ sub autocomplete {
     my $query = join( q{ }, @terms );
     return $self unless $query;
 
-    return $self->search_type('dfs_query_then_fetch')->query(
+    my $data = $self->search_type('dfs_query_then_fetch')->query(
         {
             filtered => {
                 query => {
@@ -462,6 +462,16 @@ sub autocomplete {
             }
         }
     )->sort( [ '_score', 'documentation' ] );
+
+    $data = $data->fields( [qw(documentation release author distribution)] )
+        unless $self->fields;
+
+    $data = $data->source(0)->raw->all;
+
+    single_valued_arrayref_to_scalar( $_->{fields} )
+        for @{ $data->{hits}{hits} };
+
+    return $data;
 }
 
 # this method will replace 'sub autocomplete' after the

diff --git a/lib/MetaCPAN/Server/Controller/Search/Autocomplete.pm b/lib/MetaCPAN/Server/Controller/Search/Autocomplete.pm
@@ -14,15 +14,7 @@ has '+type' => ( default => 'file' );
 
 sub get : Local : Path('') : Args(0) {
     my ( $self, $c ) = @_;
-    my $model = $self->model($c);
-    $model = $model->fields( [qw(documentation release author distribution)] )
-        unless $model->fields;
-    my $data
-        = $model->autocomplete( $c->req->param("q") )->source(0)->raw->all;
-
-    single_valued_arrayref_to_scalar( $_->{fields} )
-        for @{ $data->{hits}{hits} };
-
+    my $data = $self->model($c)->autocomplete( $c->req->param("q") );
     $c->stash($data);
 }