Skip to content

Commit

Permalink
return normal structures even when there are 0 results from queries
Browse files Browse the repository at this point in the history
  • Loading branch information
haarg committed Jul 16, 2020
1 parent 77cc81d commit 375a687
Show file tree
Hide file tree
Showing 8 changed files with 8 additions and 23 deletions.
1 change: 0 additions & 1 deletion lib/MetaCPAN/Model/Search.pm
Expand Up @@ -47,7 +47,6 @@ sub search_for_first_result {
my ( $self, $search_term ) = @_;
my $es_query = $self->build_query($search_term);
my $es_results = $self->run_query( file => $es_query );
return unless $es_results->{hits}{total};

my $data = $es_results->{hits}{hits}[0];
single_valued_arrayref_to_scalar( $data->{fields} );
Expand Down
7 changes: 6 additions & 1 deletion lib/MetaCPAN/Query/Favorite.pm
Expand Up @@ -8,7 +8,12 @@ with 'MetaCPAN::Query::Role::Common';

sub agg_by_distributions {
my ( $self, $distributions, $user ) = @_;
return unless $distributions;
return {
favorites => {},
myfavorites => {},
took => 0,
}
unless $distributions;

my $body = {
size => 0,
Expand Down
1 change: 0 additions & 1 deletion lib/MetaCPAN/Query/File.pm
Expand Up @@ -37,7 +37,6 @@ sub dir {
body => $body,
}
);
return unless $data->{hits}{total};

my $dir = [ map { $_->{fields} } @{ $data->{hits}{hits} } ];
single_valued_arrayref_to_scalar($dir);
Expand Down
1 change: 0 additions & 1 deletion lib/MetaCPAN/Query/Mirror.pm
Expand Up @@ -53,7 +53,6 @@ sub search {
@sort,
},
);
return unless $ret->{hits}{total};

my $data = [
map +{
Expand Down
1 change: 0 additions & 1 deletion lib/MetaCPAN/Query/Package.pm
Expand Up @@ -28,7 +28,6 @@ sub get_modules {
}
);

return unless $res->{hits}{total};
return +{ modules =>
[ map { $_->{_source}{module_name} } @{ $res->{hits}{hits} } ] };
}
Expand Down
5 changes: 2 additions & 3 deletions lib/MetaCPAN/Query/Permission.pm
Expand Up @@ -26,7 +26,6 @@ sub by_author {
type => 'permission',
body => $body,
);
return unless $ret->{hits}{total};

my $data = [
sort { $a->{module_name} cmp $b->{module_name} }
Expand All @@ -42,7 +41,8 @@ sub by_modules {

my @modules = map +{ term => { module_name => $_ } },
grep defined, @{$modules};
return unless @modules;
return { permissions => [] }
unless @modules;

my $body = {
query => {
Expand All @@ -56,7 +56,6 @@ sub by_modules {
type => 'permission',
body => $body,
);
return unless $ret->{hits}{total};

my $data = [
sort { $a->{module_name} cmp $b->{module_name} }
Expand Down
1 change: 0 additions & 1 deletion lib/MetaCPAN/Query/Rating.pm
Expand Up @@ -31,7 +31,6 @@ sub by_distributions {
type => 'rating',
body => $body,
);
return unless $ret->{hits}{total};

my %distributions = map { $_->{key} => $_->{ratings_dist} }
@{ $ret->{aggregations}{ratings}{buckets} };
Expand Down
14 changes: 0 additions & 14 deletions lib/MetaCPAN/Query/Release.pm
Expand Up @@ -8,7 +8,6 @@ with 'MetaCPAN::Query::Role::Common';

sub author_status {
my ( $self, $id, $file ) = @_;
return unless $id and $file;

my $status = $file->{_source}
|| single_valued_arrayref_to_scalar( $file->{fields} );
Expand Down Expand Up @@ -364,7 +363,6 @@ sub by_author_and_name {
type => 'release',
body => $body,
);
return unless $ret->{hits}{total};

my $data = $ret->{hits}{hits}[0]{_source};
single_valued_arrayref_to_scalar($data);
Expand Down Expand Up @@ -412,7 +410,6 @@ sub by_author_and_names {
type => 'release',
body => $body,
);
return unless $ret->{hits}{total};

my @releases;
for my $hit ( @{ $ret->{hits}{hits} } ) {
Expand Down Expand Up @@ -454,7 +451,6 @@ sub by_author {
type => 'release',
body => $body,
);
return unless $ret->{hits}{total};

my $data = [ map { $_->{_source} } @{ $ret->{hits}{hits} } ];
single_valued_arrayref_to_scalar($data);
Expand Down Expand Up @@ -491,7 +487,6 @@ sub latest_by_distribution {
type => 'release',
body => $body,
);
return unless $ret->{hits}{total};

my $data = $ret->{hits}{hits}[0]{_source};
single_valued_arrayref_to_scalar($data);
Expand Down Expand Up @@ -526,7 +521,6 @@ sub latest_by_author {
type => 'release',
body => $body,
);
return unless $ret->{hits}{total};

my $data = [ map { $_->{fields} } @{ $ret->{hits}{hits} } ];
single_valued_arrayref_to_scalar($data);
Expand All @@ -553,7 +547,6 @@ sub all_by_author {
type => 'release',
body => $body,
);
return unless $ret->{hits}{total};

my $data = [ map { $_->{fields} } @{ $ret->{hits}{hits} } ];
single_valued_arrayref_to_scalar($data);
Expand Down Expand Up @@ -583,7 +576,6 @@ sub versions {
type => 'release',
body => $body,
);
return unless $ret->{hits}{total};

my $data = [ map { $_->{fields} } @{ $ret->{hits}{hits} } ];
single_valued_arrayref_to_scalar($data);
Expand Down Expand Up @@ -676,7 +668,6 @@ sub requires {
sort => [$sort],
}
);
return {} unless $ret->{hits}{total};

return +{
data => [ map { $_->{_source} } @{ $ret->{hits}{hits} } ],
Expand Down Expand Up @@ -718,7 +709,6 @@ sub _get_latest_release {
fields => [qw< name author >],
},
);
return unless $release->{hits}{total};

my ($release_info) = map { $_->{fields} } @{ $release->{hits}{hits} };
single_valued_arrayref_to_scalar($release_info);
Expand Down Expand Up @@ -749,7 +739,6 @@ sub _get_provided_modules {
size => 999,
}
);
return unless $provided_modules->{hits}{total};

return [
map { $_->{name} }
Expand Down Expand Up @@ -805,7 +794,6 @@ sub _get_depended_releases {
sort => $sort,
}
);
return unless $depended->{hits}{total};

return +{
data => [ map { $_->{_source} } @{ $depended->{hits}{hits} } ],
Expand Down Expand Up @@ -858,7 +846,6 @@ sub recent {
type => 'release',
body => $body,
);
return unless $ret->{hits}{total};

my $data = [ map { $_->{fields} } @{ $ret->{hits}{hits} } ];
single_valued_arrayref_to_scalar($data);
Expand Down Expand Up @@ -950,7 +937,6 @@ sub modules {
type => 'file',
body => $body,
);
return unless $ret->{hits}{total};

my @files = map +{
%{ ( single_valued_arrayref_to_scalar( $_->{fields} ) )[0] },
Expand Down

0 comments on commit 375a687

Please sign in to comment.