{{ $NEXT }}
+- Fixed search for related columns overwriting existing params in generate_column_parameters
+
2.002001 2010-04-01 01:41:11 Europe/Berlin
- Remove debugging code and other noise from tests
{
my ($self, $source, $param, $join, $base) = @_;
$base ||= 'me';
- my $search_params;
+ my $search_params = {};
# build up condition
foreach my $column (keys %$param)
next;
}
- %$search_params =
- %{
+ $search_params = { %$search_params, %{
$self->generate_column_parameters
(
$source->related_source($column),
Catalyst::Controller::DBIC::API::JoinBuilder->new(parent => $join, name => $column),
$column
)
- };
+ }};
}
else
{
my $artist_list_url = "$base/api/rest/artist";
my $filtered_artist_list_url = "$base/api/rest/bound_artist";
my $producer_list_url = "$base/api/rest/producer";
+my $cd_list_url = "$base/api/rest/cd";
# test open request
{
is_deeply( $response, { list => \@expected_response, success => 'true' }, 'correct data returned for class with setup_list_method specified' );
}
+{
+ my $uri = URI->new( $cd_list_url );
+ $uri->query_form({ 'search.tracks.position' => '1', 'search.artist.name' => 'Caterwauler McCrae' });
+ my $req = GET( $uri, 'Accept' => 'text/x-json' );
+ $mech->request($req);
+ cmp_ok( $mech->status, '==', 200, 'search multiple params request okay' );
+ my $response = JSON::Any->Load( $mech->content);
+ my @expected_response = map { { $_->get_columns } } $schema->resultset('CD')->search({
+ 'artist.name' => 'Caterwauler McCrae',
+ 'tracks.position' => 1,
+ }, {
+ join => [qw/ artist tracks /],
+ })->all;
+ is_deeply( $response, { list => \@expected_response, success => 'true' }, 'correct data returned for multiple search params' );
+}
+
done_testing();