Pear-Trading/Foodloop-Server
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix search test for entity upgrade

Browse source
This commit is contained in:
Tom Bloor 2017-08-31 17:53:54 +01:00
parent 1ab2d0b71c
commit 2980fd129f
3 changed files with 73 additions and 133 deletions
Download patch file Download diff file Expand all files Collapse all files

31
lib/Pear/LocalLoop/Controller/Api/Upload.pm
View file

@ -137,14 +137,15 @@ sub post_upload {
return $c->api_validation_error if $validation->has_error;
$organisation = $c->schema->resultset('PendingOrganisation')->create({
submitted_by => $user,
submitted_at => DateTime->now,
name => $validation->param('organisation_name'),
street_name => $validation->param('street_name'),
town => $validation->param('town'),
postcode => $validation->param('postcode'),
my $entity = $c->schema->resultset('Entity')->create_org({
submitted_by_id => $user->id,
name => $validation->param('organisation_name'),
street_name => $validation->param('street_name'),
town => $validation->param('town'),
postcode => $validation->param('postcode'),
pending => \"1"
});
$organisation = $entity->organisation;
}
unless ( defined $organisation ) {
@ -164,12 +165,12 @@ sub post_upload {
$purchase_time ||= DateTime->now();
my $file = defined $upload ? $c->store_file_from_upload( $upload ) : undef;
my $new_transaction = $organisation->create_related(
'transactions',
my $new_transaction = $organisation->entity->create_related(
'sales',
{
buyer => $user,
buyer => $user->entity,
value => $transaction_value,
( defined $file ? ( proof_image => $file ) : ( proof_image => 'a' ) ),
( defined $file ? ( proof_image => $file ) : () ),
purchase_time => $c->format_db_datetime($purchase_time),
}
);
@ -209,11 +210,15 @@ sub post_search {
my $search_stmt = [ 'LOWER("name") LIKE ?', '%' . lc $search_name . '%' ];
my $valid_orgs_rs = $c->schema->resultset('Organisation')->search(
my $org_rs = $c->schema->resultset('Organisation');
my $valid_orgs_rs = $org_rs->search({ pending => 0 })->search(
\$search_stmt,
);
my $pending_orgs_rs = $c->stash->{api_user}->pending_organisations->search(
my $pending_orgs_rs = $org_rs->search({
pending => 1,
submitted_by_id => $c->stash->{api_user}->id,
})->search(
\$search_stmt,
);