Merge pull request #764 from metacpan/autocomplete_suggester

Improve autocomplete when using suggester

Author: mickeyn

lib/MetaCPAN/Document/File/Set.pm

@@ -4,9 +4,28 @@ use Moose;
 
 use MetaCPAN::Util qw( single_valued_arrayref_to_scalar );
 use Ref::Util qw( is_hashref );
+use List::Util qw( max );
+
+use MetaCPAN::Query::Favorite;
 
 extends 'ElasticSearchX::Model::Document::Set';
 
+has query_favorite => (
+    is      => 'ro',
+    isa     => 'MetaCPAN::Query::Favorite',
+    lazy    => 1,
+    builder => '_build_query_favorite',
+    handles => [qw< agg_by_distributions >],
+);
+
+sub _build_query_favorite {
+    my $self = shift;
+    return MetaCPAN::Query::Favorite->new(
+        es         => $self->es,
+        index_name => $self->index->name,
+    );
+}
+
 my @ROGUE_DISTRIBUTIONS = qw(
     Bundle-Everything
     kurila
@@ -479,10 +498,11 @@ sub autocomplete {
 # mapping + data is fully deployed.
 # -- Mickey
 sub autocomplete_using_suggester {
-    my ( $self, @terms ) = @_;
-    my $query = join( q{ }, @terms );
+    my ( $self, $query ) = @_;
     return $self unless $query;
 
+    my $search_size = 50;
+
     my $suggestions
         = $self->search_type('dfs_query_then_fetch')->es->suggest(
         {
@@ -492,7 +512,7 @@ sub autocomplete_using_suggester {
                     text       => $query,
                     completion => {
                         field => "suggest",
-                        size  => 50,
+                        size  => $search_size,
                     }
                 }
             },
@@ -502,8 +522,8 @@ sub autocomplete_using_suggester {
     my %docs;
 
     for my $suggest ( @{ $suggestions->{documentation}[0]{options} } ) {
-        next if exists $docs{ $suggest->{text} };
-        $docs{ $suggest->{text} } = $suggest->{score};
+        $docs{ $suggest->{text} } = max grep {defined}
+            ( $docs{ $suggest->{text} }, $suggest->{score} );
     }
 
     my $data = $self->es->search(
@@ -512,21 +532,6 @@ sub autocomplete_using_suggester {
             type  => 'file',
             body  => {
                 query => {
-                    filtered => {
-                        query => {
-                            function_score => {
-                                script_score => {
-                                    script => {
-                                        lang => 'groovy',
-                                        file =>
-                                            'prefer_shorter_module_names_400',
-                                    },
-                                },
-                            },
-                        },
-                    },
-                },
-                filter => {
                     bool => {
                         must => [
                             { term => { indexed    => 1 } },
@@ -536,21 +541,38 @@ sub autocomplete_using_suggester {
                                 terms => { 'documentation' => [ keys %docs ] }
                             },
                         ],
+                        must_not => [
+                            {
+                                terms =>
+                                    { distribution => \@ROGUE_DISTRIBUTIONS }
+                            },
+                        ],
                     }
                 },
             },
-            fields => ['documentation'],
-            size   => 10,
+            fields => [ 'documentation', 'distribution' ],
+            size   => $search_size,
         }
     );
 
-    return +{
-        suggestions => [
-            sort { length($a) <=> length($b) || $a cmp $b }
-                map { $_->{fields}{documentation}[0] }
-                @{ $data->{hits}{hits} }
-        ]
-    };
+    my %valid = map {
+        ( $_->{fields}{documentation}[0] => $_->{fields}{distribution}[0] )
+    } @{ $data->{hits}{hits} };
+
+    my $exact = delete $valid{$query};
+
+    my $favorites
+        = $self->agg_by_distributions( [ values %valid ] )->{favorites};
+
+    my @sorted = sort {
+               $favorites->{ $valid{$b} } <=> $favorites->{ $valid{$a} }
+            || $docs{$b} <=> $docs{$a}
+            || length($a) <=> length($b)
+            || $a cmp $b
+        }
+        keys %valid;
+
+    return +{ suggestions => [ grep {defined} ( $exact, @sorted ) ] };
 }
 
 sub dir {