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

Fix upload tests for entity upgrade

Browse source
This commit is contained in:
Tom Bloor 2017-08-31 19:03:49 +01:00
parent e91863a3d7
commit dd6e21eb50
3 changed files with 24 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -112,7 +112,7 @@ sub post_upload {
if ( $type == 1 ) { if ( $type == 1 ) {
# Validated Organisation # Validated Organisation
my $valid_org_rs = $c->schema->resultset('Organisation'); my $valid_org_rs = $c->schema->resultset('Organisation')->search({ pending => 0 });
$validation->required('organisation_id')->number->in_resultset( 'id', $valid_org_rs ); $validation->required('organisation_id')->number->in_resultset( 'id', $valid_org_rs );
return $c->api_validation_error if $validation->has_error; return $c->api_validation_error if $validation->has_error;
@ -121,7 +121,7 @@ sub post_upload {
} elsif ( $type == 2 ) { } elsif ( $type == 2 ) {
# Unvalidated Organisation # Unvalidated Organisation
my $valid_org_rs = $c->schema->resultset('PendingOrganisation')->search({ submitted_by_id => $user->id }); my $valid_org_rs = $c->schema->resultset('Organisation')->search({ submitted_by_id => $user->id, pending => 1 });
$validation->required('organisation_id')->number->in_resultset( 'id', $valid_org_rs ); $validation->required('organisation_id')->number->in_resultset( 'id', $valid_org_rs );
return $c->api_validation_error if $validation->has_error; return $c->api_validation_error if $validation->has_error;

2
lib/Pear/LocalLoop/Schema/Result/Transaction.pm
View file

@ -35,7 +35,7 @@ __PACKAGE__->add_columns(
}, },
"proof_image" => { "proof_image" => {
data_type => "text", data_type => "text",
is_nullable => 0, is_nullable => 1,
}, },
"submitted_at" => { "submitted_at" => {
data_type => "datetime", data_type => "datetime",

39
t/api/upload.t
View file

@ -20,24 +20,25 @@ $schema->resultset('AccountToken')->populate([
my $test_purchase_time = "2017-08-14T11:29:07.965+01:00"; my $test_purchase_time = "2017-08-14T11:29:07.965+01:00";
#Add one company that we've apparently authenticated but does not have an account. #Add one company that we've apparently authenticated but does not have an account.
my $org_id_shinra = 1;
my $org_rs = $schema->resultset('Organisation'); my $org_rs = $schema->resultset('Organisation');
is $org_rs->count, 0, "No organisations"; is $org_rs->count, 0, "No organisations";
$org_rs->create({ my $shinra_entity = $schema->resultset('Entity')->create_org({
id => $org_id_shinra,
name => 'Shinra Electric Power Company', name => 'Shinra Electric Power Company',
street_name => 'Sector 0, Midgar, Eastern Continent', street_name => 'Sector 0, Midgar, Eastern Continent',
town => 'Gaia', town => 'Gaia',
postcode => 'E1 M00', postcode => 'E1 M00',
submitted_by_id => 1,
}); });
is $org_rs->count, 1, "1 testing organisation"; is $org_rs->count, 1, "1 testing organisation";
my $org_id_shinra = $shinra_entity->organisation->id;
#Valid customer, this also tests that redirects are disabled for register. #Valid customer, this also tests that redirects are disabled for register.
print "test 1 - Create customer user account (Rufus)\n"; print "test 1 - Create customer user account (Rufus)\n";
my $emailRufus = 'rufus@shinra.energy'; my $emailRufus = 'test1@example.com';
my $passwordRufus = 'MakoGold'; my $passwordRufus = 'abc123';
my $testJson = { my $testJson = {
'usertype' => 'customer', 'usertype' => 'customer',
'token' => shift(@account_tokens), 'token' => shift(@account_tokens),
@ -203,6 +204,7 @@ $json = {
$upload = {json => Mojo::JSON::encode_json($json)}; $upload = {json => Mojo::JSON::encode_json($json)};
$t->post_ok('/api/upload' => form => $upload ) $t->post_ok('/api/upload' => form => $upload )
->status_is(200) ->status_is(200)
->or($framework->dump_error)
->json_is('/success', Mojo::JSON->true) ->json_is('/success', Mojo::JSON->true)
->json_like('/message', qr/Upload Successful/); ->json_like('/message', qr/Upload Successful/);
is $schema->resultset('Transaction')->count, 1, "1 transaction"; is $schema->resultset('Transaction')->count, 1, "1 transaction";
@ -270,8 +272,8 @@ $t->post_ok('/api/upload' => form => $upload )
->content_like(qr/organisation_name is missing/i); ->content_like(qr/organisation_name is missing/i);
print "test 17 - add valid transaction (type 3: new organisation)\n"; print "test 17 - add valid transaction (type 3: new organisation)\n";
is $schema->resultset('PendingOrganisation')->count, 0, "No pending organisations"; is $schema->resultset('Organisation')->search({ pending => 1 })->count, 0, "No pending organisations";
is $schema->resultset('PendingTransaction')->count, 0, "No pending transactions"; is $schema->resultset('Organisation')->search({ pending => 1 })->entity->sales->count, 0, "No pending transactions";
$json = { $json = {
transaction_value => 10, transaction_value => 10,
@ -288,8 +290,8 @@ $t->post_ok('/api/upload' => form => $upload )
->status_is(200) ->status_is(200)
->json_is('/success', Mojo::JSON->true) ->json_is('/success', Mojo::JSON->true)
->json_like('/message', qr/Upload Successful/); ->json_like('/message', qr/Upload Successful/);
is $schema->resultset('PendingOrganisation')->count, 1, "1 pending organisations"; is $schema->resultset('Organisation')->search({ pending => 1 })->count, 1, "1 pending organisations";
is $schema->resultset('PendingTransaction')->count, 1, "1 pending transactions"; is $schema->resultset('Organisation')->search({ pending => 1 })->entity->sales->count, 1, "1 pending transactions";
# Add type 2 (unverified organisation) checking. # Add type 2 (unverified organisation) checking.
@ -303,6 +305,7 @@ $json = {
$upload = {json => Mojo::JSON::encode_json($json), file => {file => './t/test.jpg'}}; $upload = {json => Mojo::JSON::encode_json($json), file => {file => './t/test.jpg'}};
$t->post_ok('/api/upload' => form => $upload ) $t->post_ok('/api/upload' => form => $upload )
->status_is(400) ->status_is(400)
->or($framework->dump_error)
->json_is('/success', Mojo::JSON->false) ->json_is('/success', Mojo::JSON->false)
->content_like(qr/organisation_id is missing/i); ->content_like(qr/organisation_id is missing/i);
@ -335,10 +338,10 @@ $t->post_ok('/api/upload' => form => $upload )
->content_like(qr/organisation_id does not exist in the database/i); ->content_like(qr/organisation_id does not exist in the database/i);
print "test 21 - purchase_time is missing\n"; print "test 21 - purchase_time is missing\n";
is $schema->resultset('PendingTransaction')->count, 1, "1 pending transactions"; is $schema->resultset('Organisation')->search({ pending => 1 })->entity->sales->count, 1, "1 pending transactions";
$json = { $json = {
transaction_value => 10, transaction_value => 10,
transaction_type => 2, transaction_type => 1,
organisation_id => $org_id_shinra, organisation_id => $org_id_shinra,
session_key => $session_key, session_key => $session_key,
}; };
@ -369,9 +372,9 @@ $t->post_ok('/api/login' => json => $testJson)
$session_key = $t->tx->res->json('/session_key'); $session_key = $t->tx->res->json('/session_key');
print "test 24 - add valid transaction but for with account (type 2: existing organisation)\n"; print "test 24 - add valid transaction but for with account (type 2: existing organisation)\n";
my $org_result = $schema->resultset('PendingOrganisation')->find({ name => '7th Heaven' }); my $org_result = $schema->resultset('Organisation')->find({ name => '7th Heaven' });
my $unvalidatedOrganisationId = $org_result->id; my $unvalidatedOrganisationId = $org_result->id;
is $schema->resultset('PendingTransaction')->count, 2, "2 pending transactions"; is $schema->resultset('Organisation')->search({ pending => 1 })->entity->sales->count, 1, "1 pending transactions";
$json = { $json = {
transaction_value => 10, transaction_value => 10,
transaction_type => 2, transaction_type => 2,
@ -384,7 +387,7 @@ $t->post_ok('/api/upload' => form => $upload )
->status_is(400) ->status_is(400)
->json_is('/success', Mojo::JSON->false) ->json_is('/success', Mojo::JSON->false)
->content_like(qr/organisation_id does not exist in the database/i); ->content_like(qr/organisation_id does not exist in the database/i);
is $schema->resultset('PendingTransaction')->count, 2, "2 pending transactions"; is $schema->resultset('Organisation')->search({ pending => 1 })->entity->sales->count, 1, "1 pending transactions";
print "test 25 - Logout Hojo\n"; print "test 25 - Logout Hojo\n";
$t->post_ok('/api/logout', json => { session_key => $session_key } ) $t->post_ok('/api/logout', json => { session_key => $session_key } )
@ -408,7 +411,7 @@ $t->post_ok('/api/login' => json => $testJson)
$session_key = $t->tx->res->json('/session_key'); $session_key = $t->tx->res->json('/session_key');
print "test 27 - add valid transaction (type 2: existing organisation)\n"; print "test 27 - add valid transaction (type 2: existing organisation)\n";
is $schema->resultset('PendingTransaction')->count, 2, "2 pending transactions"; is $schema->resultset('Organisation')->search({ pending => 1 })->entity->sales->count, 1, "1 pending transactions";
$json = { $json = {
transaction_value => 10, transaction_value => 10,
transaction_type => 2, transaction_type => 2,
@ -421,7 +424,7 @@ $t->post_ok('/api/upload' => form => $upload )
->status_is(200) ->status_is(200)
->json_is('/success', Mojo::JSON->true) ->json_is('/success', Mojo::JSON->true)
->json_like('/message', qr/Upload Successful/); ->json_like('/message', qr/Upload Successful/);
is $schema->resultset('PendingTransaction')->count, 3, "3 pending transactions"; is $schema->resultset('Organisation')->search({ pending => 1 })->entity->sales->count, 2, "2 pending transactions";
print "test 28 - Logout Rufus\n"; print "test 28 - Logout Rufus\n";
@ -446,7 +449,7 @@ $t->post_ok('/api/login' => json => $testJson)
$session_key = $t->tx->res->json('/session_key'); $session_key = $t->tx->res->json('/session_key');
print "test 30 - organisation buy from another organisation\n"; print "test 30 - organisation buy from another organisation\n";
is $schema->resultset('Transaction')->count, 2, "2 transaction"; is $schema->resultset('Transaction')->count, 5, "5 transaction";
$json = { $json = {
transaction_value => 100000, transaction_value => 100000,
transaction_type => 1, transaction_type => 1,
@ -459,6 +462,6 @@ $t->post_ok('/api/upload' => form => $upload )
->status_is(200) ->status_is(200)
->json_is('/success', Mojo::JSON->true) ->json_is('/success', Mojo::JSON->true)
->json_like('/message', qr/Upload Successful/); ->json_like('/message', qr/Upload Successful/);
is $schema->resultset('Transaction')->count, 3, "3 transaction"; is $schema->resultset('Transaction')->count, 6, "6 transaction";
done_testing(); done_testing();