move file history from model to query

Author: haarg

lib/MetaCPAN/Document/File/Set.pm

@@ -677,5 +677,74 @@ sub find_pod {
     }
 }
 
+sub history {
+    my ( $self, $type, $name, $path, $opts ) = @_;
+
+    $opts ||= {};
+    if ( ref $path ) {
+        $path = join '/', @$path;
+    }
+
+    my $source = $opts->{fields};
+
+    my $query
+        = $type eq "module"
+        ? {
+        nested => {
+            path  => 'module',
+            query => {
+                constant_score => {
+                    filter => {
+                        bool => {
+                            must => [
+                                { term => { "module.authorized" => true } },
+                                { term => { "module.indexed"    => true } },
+                                { term => { "module.name"       => $name } },
+                            ]
+                        }
+                    }
+                }
+            }
+        }
+        }
+        : $type eq "file" ? {
+        bool => {
+            must => [
+                { term => { path         => $path } },
+                { term => { distribution => $name } },
+            ]
+        }
+        }
+
+        # XXX: to fix: no filtering on 'release' so this query
+        # will produce modules matching duplications. -- Mickey
+        : $type eq "documentation" ? {
+        bool => {
+            must => [
+                { match_phrase => { documentation => $name } },
+                { term         => { indexed       => true } },
+                { term         => { authorized    => true } },
+            ]
+        }
+        }
+        : return undef;
+
+    my $res = $self->es->search(
+        es_doc_path('file'),
+        body => {
+            query => $query,
+            size  => 500,
+            sort  => [ { date => 'desc' } ],
+            ( $source ? ( _source => $source ) : () ),
+        },
+    );
+
+    return {
+        took  => $res->{took},
+        total => hit_total($res),
+        files => [ map $_->{_source}, @{ $res->{hits}{hits} } ],
+    };
+}
+
 __PACKAGE__->meta->make_immutable;
 1;

lib/MetaCPAN/Query/File.pm

@@ -12,9 +12,11 @@ with 'MetaCPAN::Server::Role::JSONP';
 has '+type' => ( default => 'file' );
 
 sub get : Local : Path('') : Args {
-    my ( $self, $c, @args ) = @_;
-    my $data = $self->model($c)->history(@args)->raw;
-    $c->stash( $data->all );
+    my ( $self, $c, $type, $name, @path ) = @_;
+    my $fields = $c->res->fields;
+    my $data   = $c->model('ESQuery')
+        ->file->history( $type, $name, \@path, { fields => $fields } );
+    $c->stash($data);
 }
 
 1;

lib/MetaCPAN/Server/Controller/Search/History.pm

@@ -2,8 +2,8 @@ use strict;
 use warnings;
 use lib 't/lib';
 
-use MetaCPAN::Server::Test qw( model );
-use MetaCPAN::Util         qw( true false hit_total );
+use MetaCPAN::Server::Test qw( model query );
+use MetaCPAN::Util         qw( true false );
 use Test::More;
 
 my $model = model();
@@ -85,16 +85,16 @@ $signature = $model->doc('file')->query( {
 ok( !$signature, 'SIGNATURE is not pod' );
 
 {
-    my $files  = $model->doc('file');
-    my $module = $files->history( module => 'Moose' )->raw->all;
-    my $file   = $files->history( file => 'Moose', 'lib/Moose.pm' )->raw->all;
+    my $files  = query()->file;
+    my $module = $files->history( module => 'Moose' );
+    my $file   = $files->history( file   => 'Moose', 'lib/Moose.pm' );
 
     is_deeply( $module->{hits}, $file->{hits},
         'history of Moose and lib/Moose.pm match' );
-    is( hit_total($module), 2, 'two hits' );
+    is( $module->{total}, 2, 'two hits' );
 
-    my $pod = $files->history( documentation => 'Moose::FAQ' )->raw->all;
-    is( hit_total($pod), 1, 'one hit' );
+    my $pod = $files->history( documentation => 'Moose::FAQ' );
+    is( $pod->{total}, 1, 'one hit' );
 }
 
 done_testing;