Activity: fix query terms

A quick fix to terms that are currently not matching anything. Next, these queries will be moved to the API.
metacpan · May 27, 2017 · 700c7c8 · 700c7c8
1 parent 5d34c8e
commit 700c7c8
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 24 deletions.
diff --git a/lib/MetaCPAN/Web/Controller/Activity.pm b/lib/MetaCPAN/Web/Controller/Activity.pm
@@ -21,16 +21,12 @@ sub index : Path : Args(0) {
         push( @$q, { term => { distribution => $distribution } } );
     }
     if ( my $requires = $req->parameters->{requires} ) {
-        push( @$q, { term => { 'release.dependency.module' => $requires } } );
+        push( @$q, { term => { 'dependency.module' => $requires } } );
     }
     if ( $req->parameters->{f} && $req->parameters->{f} eq 'n' ) {
-        push(
-            @$q,
-            @{
-                $c->model('API::Release')
-                    ->_new_distributions_query->{constant_score}->{filter}
-                    ->{and}
-            }
+        push( @$q,
+            { term  => { first  => 1 } },
+            { terms => { status => [qw< cpan latest >] } },
         );
     }
 

diff --git a/lib/MetaCPAN/Web/Model/API/Release.pm b/lib/MetaCPAN/Web/Model/API/Release.pm
@@ -48,21 +48,6 @@ sub distribution {
     $self->request("/distribution/$dist");
 }
 
-sub _new_distributions_query {
-    return {
-        constant_score => {
-            filter => {
-                bool => {
-                    must => [
-                        { term  => { first  => 1 } },
-                        { terms => { status => [qw< cpan latest >] } },
-                    ]
-                }
-            }
-        }
-    };
-}
-
 sub latest_by_author {
     my ( $self, $author ) = @_;
     return $self->request(
@@ -106,7 +91,18 @@ sub recent {
     my ( $self, $page, $page_size, $type ) = @_;
     my $query;
     if ( $type eq 'n' ) {
-        $query = $self->_new_distributions_query;
+        $query = {
+            constant_score => {
+                filter => {
+                    bool => {
+                        must => [
+                            { term  => { first  => 1 } },
+                            { terms => { status => [qw< cpan latest >] } },
+                        ]
+                    }
+                }
+            }
+        };
     }
     elsif ( $type eq 'a' ) {
         $query = { match_all => {} };