use query methods via ESQuery rather than the delegated model methods

metacpan · Jan 14, 2025 · a35c371 · a35c371
1 parent e4f72f4
commit a35c371
Show file tree

Hide file tree

Showing 29 changed files with 91 additions and 357 deletions.
diff --git a/lib/MetaCPAN/Document/Author/Set.pm b/lib/MetaCPAN/Document/Author/Set.pm
diff --git a/lib/MetaCPAN/Document/CVE/Set.pm b/lib/MetaCPAN/Document/CVE/Set.pm
diff --git a/lib/MetaCPAN/Document/Contributor/Set.pm b/lib/MetaCPAN/Document/Contributor/Set.pm
diff --git a/lib/MetaCPAN/Document/Cover/Set.pm b/lib/MetaCPAN/Document/Cover/Set.pm
diff --git a/lib/MetaCPAN/Document/Distribution/Set.pm b/lib/MetaCPAN/Document/Distribution/Set.pm
diff --git a/lib/MetaCPAN/Document/Favorite/Set.pm b/lib/MetaCPAN/Document/Favorite/Set.pm
diff --git a/lib/MetaCPAN/Document/File/Set.pm b/lib/MetaCPAN/Document/File/Set.pm
@@ -11,24 +11,6 @@ use MetaCPAN::Util            qw( true false );
 
 extends 'ElasticSearchX::Model::Document::Set';
 
-has query_file => (
-    is      => 'ro',
-    isa     => 'MetaCPAN::Query::File',
-    lazy    => 1,
-    builder => '_build_query_file',
-    handles => [ qw(
-        dir
-        find_changes_files
-        interesting_files
-        files_by_category
-    ) ],
-);
-
-sub _build_query_file {
-    my $self = shift;
-    return MetaCPAN::Query::File->new( es => $self->es );
-}
-
 has query_favorite => (
     is      => 'ro',
     isa     => 'MetaCPAN::Query::Favorite',
@@ -42,19 +24,6 @@ sub _build_query_favorite {
     return MetaCPAN::Query::Favorite->new( es => $self->es );
 }
 
-has query_release => (
-    is      => 'ro',
-    isa     => 'MetaCPAN::Query::Release',
-    lazy    => 1,
-    builder => '_build_query_release',
-    handles => [qw< find_download_url >],
-);
-
-sub _build_query_release {
-    my $self = shift;
-    return MetaCPAN::Query::Release->new( es => $self->es );
-}
-
 my @ROGUE_DISTRIBUTIONS = qw(
     Acme-DependOnEverything
     Bundle-Everything

diff --git a/lib/MetaCPAN/Document/Mirror/Set.pm b/lib/MetaCPAN/Document/Mirror/Set.pm
diff --git a/lib/MetaCPAN/Document/Package/Set.pm b/lib/MetaCPAN/Document/Package/Set.pm
diff --git a/lib/MetaCPAN/Document/Permission/Set.pm b/lib/MetaCPAN/Document/Permission/Set.pm
diff --git a/lib/MetaCPAN/Document/Release/Set.pm b/lib/MetaCPAN/Document/Release/Set.pm
diff --git a/lib/MetaCPAN/Server/Controller/Activity.pm b/lib/MetaCPAN/Server/Controller/Activity.pm
@@ -13,7 +13,7 @@ sub get : Path('') : Args(0) {
     my ( $self, $c ) = @_;
 
     $c->stash_or_detach(
-        $c->model('ESModel')->doc('release')->activity( $c->req->params ) );
+        $c->model('ESQuery')->release->activity( $c->req->params ) );
 }
 
 __PACKAGE__->meta->make_immutable;

diff --git a/lib/MetaCPAN/Server/Controller/Author.pm b/lib/MetaCPAN/Server/Controller/Author.pm
@@ -16,33 +16,34 @@ sub get : Path('') : Args(1) {
     $c->cdn_max_age('1y');
     my $file = $self->model($c)->raw->get($id);
     $c->stash_or_detach(
-        $c->model('ESModel')->doc('release')->author_status( $id, $file ) );
+        $c->model('ESQuery')->release->author_status( $id, $file ) );
 }
 
 # /author/search?q=QUERY
 sub qsearch : Path('search') : Args(0) {
     my ( $self, $c ) = @_;
-    $c->stash_or_detach(
-        $self->model($c)->search( @{ $c->req->params }{qw( q from )} ) );
+    $c->stash_or_detach( $c->model('ESQuery')
+            ->author->search( @{ $c->req->params }{qw( q from )} ) );
 }
 
 # /author/by_ids?id=PAUSE_ID1&id=PAUSE_ID2...
 sub by_ids : Path('by_ids') : Args(0) {
     my ( $self, $c ) = @_;
-    $c->stash_or_detach( $self->model($c)->by_ids( $c->read_param('id') ) );
+    $c->stash_or_detach(
+        $c->model('ESQuery')->author->by_ids( $c->read_param('id') ) );
 }
 
 # /author/by_user/USER_ID
 sub by_user : Path('by_user') : Args(1) {
     my ( $self, $c, $user ) = @_;
-    $c->stash_or_detach( $self->model($c)->by_user($user) );
+    $c->stash_or_detach( $c->model('ESQuery')->author->by_user($user) );
 }
 
 # /author/by_user?user=USER_ID1&user=USER_ID2...
 sub by_users : Path('by_user') : Args(0) {
     my ( $self, $c ) = @_;
     $c->stash_or_detach(
-        $self->model($c)->by_user( $c->read_param('user') ) );
+        $c->model('ESQuery')->author->by_user( $c->read_param('user') ) );
 }
 
 # /author/by_prefix/PAUSE_ID_PREFIX
@@ -51,8 +52,11 @@ sub by_prefix : Path('by_prefix') : Args(1) {
     my $size = $c->req->param('size') // 500;
     my $from = $c->req->param('from') // 0;
 
-    $c->stash_or_detach( $self->model($c)
-            ->prefix_search( $prefix, { size => $size, from => $from } ) );
+    $c->stash_or_detach(
+        $c->model('ESQuery')->author->prefix_search(
+            $prefix, { size => $size, from => $from }
+        )
+    );
 }
 
 1;