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

Merge branch 'development' into finn/OrgDataAPI

This commit is contained in:
Finn 2017-09-18 15:39:14 +01:00
parent 26a37904d2 7366c5035b
commit b224182e61
35 changed files with 2151 additions and 175 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
CHANGELOG.md Normal file
View File

@ -0,0 +1,62 @@
# Changelog
# Next Release
# v0.9.2
* **Fix:** Leaderboard total calculations not mapped correctly
* **Fix:** Reroute to org list on submission
# v0.9.1
* Change to semantic versioning
* Change database schema to use entity style model
* Added schema graphs for showing the schema layout
* **Fix:** null values on Org Graphs
* **Feature:** Org Graphs for sales and purchase data
* **Fix:** Deny organisations buying from themselves
* **Feature:** API endpoint for viewing purchases
* **Feature:** Transaction viewing in Admin interface
* **Fix:** Booleans under postgres and sqlite
* **Feature:** Organisation snippets API
# v0.009
*No changes recorded*
# v0.008.1
*No changes recorded*
# v0.008
*No changes recorded*
# v0.007
*No changes recorded*
# v0.006
*No changes recorded*
# v0.005
*No changes recorded*
# v0.004
*No changes recorded*
# v0.003
Made leaderboard cronjob scripts work correctly by using production config
instead of defaulting to development
# v0.002
Release with leaderboard scripts for automatic generation of leaderboards
# v0.001
First release with basic functionality.

13
lib/Pear/LocalLoop.pm
View File

@ -67,23 +67,13 @@ sub startup {
json => {
success => Mojo::JSON->false,
message => $c->error_messages->{$val}->{$check}->{message},
error => $check,
error => $c->error_messages->{$val}->{$check}->{error} || $check,
},
status => $c->error_messages->{$val}->{$check}->{status},
);
}
});
$self->helper( datetime_formatter => sub {
my $c = shift;
return DateTime::Format::Strptime->new(
pattern => '%FT%T%z',
strict => 1,
on_error => 'undef',
);
});
$self->helper( get_path_from_uuid => sub {
my $c = shift;
my $uuid = shift;
@ -150,7 +140,6 @@ sub startup {
$api->post('/search')->to('api-upload#post_search');
$api->post('/user')->to('api-user#post_account');
$api->post('/user/account')->to('api-user#post_account_update');
$api->post('/user/day')->to('api-user#post_day');
$api->post('/user-history')->to('api-user#post_user_history');
$api->post('/stats')->to('api-stats#post_index');
$api->post('/stats/leaderboard')->to('api-stats#post_leaderboards');

2
lib/Pear/LocalLoop/Controller/Admin/Organisations.pm
View File

@ -115,7 +115,7 @@ sub valid_edit {
$c->flash( success => 'Updated Organisation' );
}
};
$c->redirect_to( '/admin/organisations/' . $valid_org->id );
$c->redirect_to( '/admin/organisations/');
}
1;

4
lib/Pear/LocalLoop/Controller/Api/Feedback.pm
View File

@ -4,8 +4,8 @@ use Mojo::Base 'Mojolicious::Controller';
has error_messages => sub {
return {
email => {
required => { message => 'Email is required', status => 400 },
in_resultset => { message => 'Change meeee', status => 400 },
required => { message => 'Email is required or not registered', status => 400 },
in_resultset => { message => 'Email is required or not registered', status => 400, error => "required" },
},
feedbacktext => {
required => { message => 'Feedback is required', status => 400 },

20
lib/Pear/LocalLoop/Controller/Api/Register.pm
View File

@ -9,18 +9,18 @@ has error_messages => sub {
in_resultset => { message => 'Token invalid or has been used.', status => 401 },
},
name => {
required => { message => 'No name sent or was blank.', status => 400 },
required => { message => 'No organisation name sent or was blank.', status => 400 },
},
display_name => {
required => { message => 'No name sent or was blank.', status => 400 },
required => { message => 'No display name sent or was blank.', status => 400 },
},
full_name => {
required => { message => 'No name sent or was blank.', status => 400 },
required => { message => 'No full name sent or was blank.', status => 400 },
},
email => {
required => { message => 'No email sent.', status => 400 },
email => { message => 'Email is invalid.', status => 400 },
not_in_resultset => { message => 'Email exists.', status => 403 },
not_in_resultset => { message => 'Email already in use.', status => 403 },
},
postcode => {
required => { message => 'No postcode sent.', status => 400 },
@ -34,16 +34,16 @@ has error_messages => sub {
in => { message => '"usertype" is invalid.', status => 400 },
},
year_of_birth => {
required => { message => 'No year_of_birth sent.', status => 400 },
number => { message => 'year_of_birth is invalid', status => 400 },
gt_num => { message => 'year_of_birth must be within last 150 years', status => 400 },
lt_num => { message => 'year_of_birth must be atleast 10 years ago', status => 400 },
required => { message => 'No year of birth sent.', status => 400 },
number => { message => 'year of birth is invalid', status => 400 },
gt_num => { message => 'year of birth must be within last 150 years', status => 400 },
lt_num => { message => 'year of birth must be atleast 10 years ago', status => 400 },
},
street_name => {
required => { message => 'No street_name sent.', status => 400 },
required => { message => 'No street name sent.', status => 400 },
},
town => {
required => { message => 'No town sent.', status => 400 },
required => { message => 'No town/city sent.', status => 400 },
},
};
};

29
lib/Pear/LocalLoop/Controller/Api/Stats.pm
View File

@ -18,23 +18,23 @@ sub post_index {
my $user = $c->stash->{api_user}->entity;
my $today_rs = $user->purchases->today_rs;
my $today_sum = $today_rs->get_column('value')->sum;
my $today_sum = $today_rs->get_column('value')->sum || 0;
my $today_count = $today_rs->count;
my $week_rs = $user->purchases->week_rs;
my $week_sum = $week_rs->get_column('value')->sum;
my $week_sum = $week_rs->get_column('value')->sum || 0;
my $week_count = $week_rs->count;
my $month_rs = $user->purchases->month_rs;
my $month_sum = $month_rs->get_column('value')->sum;
my $month_sum = $month_rs->get_column('value')->sum || 0;
my $month_count = $month_rs->count;
my $user_rs = $user->purchases;
my $user_sum = $user_rs->get_column('value')->sum;
my $user_sum = $user_rs->get_column('value')->sum || 0;
my $user_count = $user_rs->count;
my $global_rs = $c->schema->resultset('Transaction');
my $global_sum = $global_rs->get_column('value')->sum;
my $global_sum = $global_rs->get_column('value')->sum || 0;
my $global_count = $global_rs->count;
my $leaderboard_rs = $c->schema->resultset('Leaderboard');
@ -44,15 +44,15 @@ sub post_index {
return $c->render( json => {
success => Mojo::JSON->true,
today_sum => $today_sum || 0,
today_sum => $today_sum / 100000,
today_count => $today_count,
week_sum => $week_sum || 0,
week_sum => $week_sum / 100000,
week_count => $week_count,
month_sum => $month_sum || 0,
month_sum => $month_sum / 100000,
month_count => $month_count,
user_sum => $user_sum || 0,
user_sum => $user_sum / 100000,
user_count => $user_count,
global_sum => $global_sum || 0,
global_sum => $global_sum / 100000,
global_count => $global_count,
user_position => defined $current_user_position ? $current_user_position->position : 0,
});
@ -91,6 +91,15 @@ sub post_leaderboards {
my @leaderboard_array = $today_values->all;
if ( $validation->param('type') =~ /total$/ ) {
@leaderboard_array = (map {
{
%$_,
value => $_->{value} / 100000,
}
} @leaderboard_array);
}
my $current_user_position = $today_values->find({ entity_id => $c->stash->{api_user}->entity->id });
return $c->render( json => {

2
lib/Pear/LocalLoop/Controller/Api/Transactions.pm
View File

@ -34,7 +34,7 @@ sub post_transaction_list_purchases {
my @transaction_list = (
map {{
seller => $_->seller->name,
value => $_->value,
value => $_->value / 100000,
purchase_time => $_->purchase_time,
}} $transactions->all
);

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

@ -50,17 +50,17 @@ The postcode of an organisation, optional key. Used when transaction_Type is 3.
has error_messages => sub {
return {
transaction_type => {
required => { message => 'transaction_type is missing.', status => 400 },
in => { message => 'transaction_type is not a valid value.', status => 400 },
required => { message => 'transaction type is missing.', status => 400 },
in => { message => 'transaction type is not a valid value.', status => 400 },
},
transaction_value => {
required => { message => 'transaction_value is missing', status => 400 },
number => { message => 'transaction_value does not look like a number', status => 400 },
gt_num => { message => 'transaction_value cannot be equal to or less than zero', status => 400 },
required => { message => 'transaction amount is missing', status => 400 },
number => { message => 'transaction amount does not look like a number', status => 400 },
gt_num => { message => 'transaction amount cannot be equal to or less than zero', status => 400 },
},
purchase_time => {
required => { message => 'purchase_time is missing', status => 400 },
is_full_iso_datetime => { message => 'purchase_time is in incorrect format', status => 400 },
required => { message => 'purchase time is missing', status => 400 },
is_full_iso_datetime => { message => 'purchase time is in incorrect format', status => 400 },
},
file => {
required => { message => 'No file uploaded', status => 400 },
@ -68,15 +68,18 @@ has error_messages => sub {
filetype => { message => 'File must be of type image/jpeg', status => 400 },
},
organisation_id => {
required => { message => 'organisation_id is missing', status => 400 },
number => { message => 'organisation_id is not a number', status => 400 },
in_resultset => { message => 'organisation_id does not exist in the database', status => 400 },
required => { message => 'existing organisation ID is missing', status => 400 },
number => { message => 'organisation ID is not a number', status => 400 },
in_resultset => { message => 'organisation ID does not exist in the database', status => 400 },
},
organisation_name => {
required => { message => 'organisation_name is missing', status => 400 },
required => { message => 'organisation name is missing', status => 400 },
},
town => {
required => { message => 'town/city is missing', status => 400 },
},
search_name => {
required => { message => 'search_name is missing', status => 400 },
required => { message => 'search name is missing', status => 400 },
},
postcode => {
postcode => { message => 'postcode must be valid', status => 400 },
@ -138,7 +141,7 @@ sub post_upload {
# Unknown Organisation
$validation->required('organisation_name');
$validation->optional('street_name');
$validation->optional('town');
$validation->required('town');
$validation->optional('postcode')->postcode;
return $c->api_validation_error if $validation->has_error;
@ -175,7 +178,7 @@ sub post_upload {
'sales',
{
buyer => $user->entity,
value => $transaction_value,
value => $transaction_value * 100000,
( defined $file ? ( proof_image => $file ) : () ),
purchase_time => $c->format_db_datetime($purchase_time),
}

20
lib/Pear/LocalLoop/Controller/Api/User.pm
View File

@ -28,10 +28,10 @@ has error_messages => sub {
required => { message => 'No password sent.', status => 400 },
},
street_name => {
required => { message => 'No street_name sent.', status => 400 },
required => { message => 'No street name sent.', status => 400 },
},
town => {
required => { message => 'No town sent.', status => 400 },
required => { message => 'No town/city sent.', status => 400 },
},
sector => {
required => { message => 'No sector sent.', status => 400 },
@ -39,22 +39,6 @@ has error_messages => sub {
};
};
sub post_day {
my $c = shift;
my $validation = $c->validation;
$validation->input( $c->stash->{api_json} );
$validation->optional('day')->is_iso_datetime;
return $c->api_validation_error if $validation->has_error;
$c->render( json => {
success => Mojo::JSON->true,
});
}
sub post_account {
my $c = shift;

43
lib/Pear/LocalLoop/Controller/Api/V1/Organisation/Graphs.pm
View File

@ -22,6 +22,7 @@ sub index {
sales_last_30_days
purchases_last_7_days
purchases_last_30_days
customers_range
/ );
return $c->api_validation_error if $validation->has_error;
@ -43,6 +44,40 @@ sub index {
return $c->$graph_sub;
}
sub graph_customers_range {
my $c = shift;
my $validation = $c->validation;
$validation->input( $c->stash->{api_json} );
$validation->required('start')->is_iso_date;
$validation->required('end')->is_iso_date;
return $c->api_validation_error if $validation->has_error;
my $entity = $c->stash->{api_user}->entity;
my $data = { labels => [], data => [] };
my $start = $c->parse_iso_date( $validation->param('start') );
my $end = $c->parse_iso_date( $validation->param('end') );
while ( $start <= $end ) {
my $next_end = $start->clone->add( days => 1 );
my $transactions = $entity->sales
->search_between( $start, $next_end )
->count;
push @{ $data->{ labels } }, $c->format_iso_date( $start );
push @{ $data->{ data } }, $transactions;
$start->add( days => 1 );
}
return $c->render(
json => {
success => Mojo::JSON->true,
graph => $data,
}
);
}
sub graph_customers_last_7_days {
my $c = shift;
@ -102,9 +137,9 @@ sub _sales_last_duration {
my $transactions = $entity->sales
->search_between( $start, $next_end )
->get_column('value')
->sum || 0;
->sum || 0 + 0;
push @{ $data->{ labels } }, $start->day_name;
push @{ $data->{ data } }, $transactions;
push @{ $data->{ data } }, $transactions / 100000;
$start->add( days => 1 );
}
@ -134,9 +169,9 @@ sub _purchases_last_duration {
my $transactions = $entity->purchases
->search_between( $start, $next_end )
->get_column('value')
->sum || 0;
->sum || 0 + 0;
push @{ $data->{ labels } }, $start->day_name;
push @{ $data->{ data } }, $transactions;
push @{ $data->{ data } }, $transactions / 100000;
$start->add( days => 1 );
}

6
lib/Pear/LocalLoop/Controller/Api/V1/Organisation/Snippets.pm
View File

@ -28,26 +28,32 @@ sub index {
my $today_sales = $entity->sales->search_between( $today, $now );
$data->{ today_sales_count } = $today_sales->count;
$data->{ today_sales_total } = $today_sales->get_column('value')->sum || 0;
$data->{ today_sales_total } /= 100000;
my $week_sales = $entity->sales->search_between( $week_ago, $today );
$data->{ this_week_sales_count } = $week_sales->count;
$data->{ this_week_sales_total } = $week_sales->get_column('value')->sum || 0;
$data->{ this_week_sales_total } /= 100000;
my $month_sales = $entity->sales->search_between( $month_ago, $today );
$data->{ this_month_sales_count } = $month_sales->count;
$data->{ this_month_sales_total } = $month_sales->get_column('value')->sum || 0;
$data->{ this_month_sales_total } /= 100000;
my $today_purchases = $entity->purchases->search_between( $today, $now );
$data->{ today_purchases_count } = $today_purchases->count;
$data->{ today_purchases_total } = $today_purchases->get_column('value')->sum || 0;
$data->{ today_purchases_total } /= 100000;
my $week_purchases = $entity->purchases->search_between( $week_ago, $today );
$data->{ this_week_purchases_count } = $week_purchases->count;
$data->{ this_week_purchases_total } = $week_purchases->get_column('value')->sum || 0;
$data->{ this_week_purchases_total } /= 100000;
my $month_purchases = $entity->purchases->search_between( $month_ago, $today );
$data->{ this_month_purchases_count } = $month_purchases->count;
$data->{ this_month_purchases_total } = $month_purchases->get_column('value')->sum || 0;
$data->{ this_month_purchases_total } /= 100000;
return $c->render(
json => {

66
lib/Pear/LocalLoop/Plugin/Datetime.pm
View File

@ -7,34 +7,52 @@ sub register {
my ( $plugin, $app, $conf ) = @_;
$app->helper( iso_datetime_parser => sub {
return DateTime::Format::Strptime->new( pattern => '%Y-%m-%dT%H:%M:%S.%3N%z' );
});
return DateTime::Format::Strptime->new( pattern => '%Y-%m-%dT%H:%M:%S.%3N%z' );
});
$app->helper( parse_iso_datetime => sub {
my ( $c, $date_string ) = @_;
return $c->iso_datetime_parser->parse_datetime(
$date_string,
);
});
$app->helper( iso_date_parser => sub {
return DateTime::Format::Strptime->new( pattern => '%Y-%m-%d' );
});
$app->helper( format_iso_datetime => sub {
my ( $c, $datetime_obj ) = @_;
return $c->iso_datetime_parser->parse_datetime(
$datetime_obj,
);
});
$app->helper( parse_iso_date => sub {
my ( $c, $date_string ) = @_;
return $c->iso_date_parser->parse_datetime(
$date_string,
);
});
$app->helper( db_datetime_parser => sub {
return shift->schema->storage->datetime_parser;
});
$app->helper( format_iso_date => sub {
my ( $c, $datetime_obj ) = @_;
return $c->iso_date_parser->format_datetime(
$datetime_obj,
);
});
$app->helper( format_db_datetime => sub {
my ( $c, $datetime_obj ) = @_;
$datetime_obj->set_time_zone('UTC');
return $c->db_datetime_parser->format_datetime(
$datetime_obj,
);
});
$app->helper( parse_iso_datetime => sub {
my ( $c, $date_string ) = @_;
return $c->iso_datetime_parser->parse_datetime(
$date_string,
);
});
$app->helper( format_iso_datetime => sub {
my ( $c, $datetime_obj ) = @_;
return $c->iso_datetime_parser->format_datetime(
$datetime_obj,
);
});
$app->helper( db_datetime_parser => sub {
return shift->schema->storage->datetime_parser;
});
$app->helper( format_db_datetime => sub {
my ( $c, $datetime_obj ) = @_;
$datetime_obj->set_time_zone('UTC');
return $c->db_datetime_parser->format_datetime(
$datetime_obj,
);
});
}

4
lib/Pear/LocalLoop/Plugin/Validators.pm
View File

@ -53,9 +53,9 @@ sub register {
return $app->types->type($extension) eq $filetype ? undef : 1;
});
$app->validator->add_check( is_iso_datetime => sub {
$app->validator->add_check( is_iso_date => sub {
my ( $validation, $name, $value ) = @_;
$value = $app->datetime_formatter->parse_datetime( $value );
$value = $app->iso_date_parser->parse_datetime( $value );
return defined $value ? undef : 1;
});

2
lib/Pear/LocalLoop/Schema.pm
View File

@ -6,7 +6,7 @@ use warnings;
use base 'DBIx::Class::Schema';
our $VERSION = 6;
our $VERSION = 7;
__PACKAGE__->load_namespaces;

4
lib/Pear/LocalLoop/Schema/Result/LeaderboardValue.pm
View File

@ -28,8 +28,8 @@ __PACKAGE__->add_columns(
is_nullable => 0,
},
"value" => {
data_type => "decimal",
size => [ 16, 2 ],
data_type => "numeric",
size => [ 100, 0 ],
is_nullable => 0,
},
"trend" => {

4
lib/Pear/LocalLoop/Schema/Result/Transaction.pm
View File

@ -29,8 +29,8 @@ __PACKAGE__->add_columns(
is_nullable => 0,
},
"value" => {
data_type => "decimal",
size => [ 16, 2 ],
data_type => "numeric",
size => [ 100, 0 ],
is_nullable => 0,
},
"proof_image" => {

99
lib/Test/Pear/LocalLoop.pm
View File

@ -1,5 +1,5 @@
package Test::Pear::LocalLoop;
use Mojo::Base -base;
use Moo;
use Test::More;
use File::Temp;
@ -7,12 +7,48 @@ use Test::Mojo;
use DateTime::Format::Strptime;
use DBIx::Class::Fixtures;
has config => sub {
# Conditionally require Test::PostgreSQL
sub BUILD {
if ( $ENV{PEAR_TEST_PG} ) {
require Test::PostgreSQL
or die "you need Test::PostgreSQL to run PG testing";
Test::PostgreSQL->import;
}
}
sub DEMOLISH {
my ( $self, $in_global_destruction ) = @_;
if ( $ENV{PEAR_TEST_PG} && !$in_global_destruction ) {
$self->mojo->app->schema->storage->dbh->disconnect;
$self->pg->stop;
}
}
has pg => (
is => 'lazy',
builder => sub {
return Test::PostgreSQL->new();
},
);
has config => (
is => 'lazy',
builder => sub {
my $self = shift;
my $file = File::Temp->new;
print $file <<'END';
my $dsn;
if ( $ENV{PEAR_TEST_PG} ) {
$dsn = $self->pg->dsn;
} else {
$dsn = "dbi:SQLite::memory:";
}
print $file <<"END";
{
dsn => "dbi:SQLite::memory:",
dsn => "$dsn",
user => undef,
pass => undef,
}
@ -20,9 +56,12 @@ END
$file->seek( 0, SEEK_END );
return $file;
};
},
);
has mojo => sub {
has mojo => (
is => 'lazy',
builder => sub {
my $self = shift;
$ENV{MOJO_CONFIG} = $self->config->filename;
@ -31,9 +70,18 @@ has mojo => sub {
$t->app->schema->deploy;
return $t;
};
},
);
has _deployed => sub { 0 };
has etc_dir => (
is => 'lazy',
builder => sub { die "etc dir not set" },
);
has _deployed => (
is => 'rwp',
default => 0,
);
sub framework {
my $self = shift;
@ -56,13 +104,11 @@ sub framework {
]);
}
$self->_deployed(1);
$self->_set__deployed(1);
return $t;
};
has etc_dir => sub { die "etc dir not set" };
sub dump_error {
return sub {
my $self = shift;
@ -142,11 +188,40 @@ sub install_fixtures {
});
my $t = $self->framework(1);
my $schema = $t->app->schema;
$fixtures->populate({
directory => File::Spec->catdir( $self->etc_dir, 'fixtures', 'data', $fixture_name ),
no_deploy => 1,
schema => $t->app->schema,
schema => $schema,
});
# Reset table id sequences
if ( $ENV{PEAR_TEST_PG} ) {
$schema->storage->dbh_do(
sub {
my ( $storage, $dbh, $sets ) = @_;
for my $table ( keys %$sets ) {
my $seq = $sets->{$table};
$dbh->do(
qq/
SELECT setval(
'$seq',
COALESCE(
(SELECT MAX(id)+1 FROM $table),
1
),
false
);
/);
}
},
{
entities => 'entities_id_seq',
organisations => 'organisations_id_seq',
}
);
}
}
1;

0
script/recalc_leaderboards Normal file → Executable file
View File

18
share/ddl/PostgreSQL/deploy/7/001-auto-__VERSION.sql Normal file
View File

@ -0,0 +1,18 @@
--
-- Created by SQL::Translator::Producer::PostgreSQL
-- Created on Wed Sep 13 15:24:20 2017
--
;
--
-- Table: dbix_class_deploymenthandler_versions
--
CREATE TABLE "dbix_class_deploymenthandler_versions" (
"id" serial NOT NULL,
"version" character varying(50) NOT NULL,
"ddl" text,
"upgrade_sql" text,
PRIMARY KEY ("id"),
CONSTRAINT "dbix_class_deploymenthandler_versions_version" UNIQUE ("version")
);
;

210
share/ddl/PostgreSQL/deploy/7/001-auto.sql Normal file
View File

@ -0,0 +1,210 @@
--
-- Created by SQL::Translator::Producer::PostgreSQL
-- Created on Wed Sep 13 15:24:20 2017
--
;
--
-- Table: account_tokens
--
CREATE TABLE "account_tokens" (
"id" serial NOT NULL,
"name" text NOT NULL,
"used" integer DEFAULT 0 NOT NULL,
PRIMARY KEY ("id"),
CONSTRAINT "account_tokens_name" UNIQUE ("name")
);
;
--
-- Table: entities
--
CREATE TABLE "entities" (
"id" serial NOT NULL,
"type" character varying(255) NOT NULL,
PRIMARY KEY ("id")
);
;
--
-- Table: leaderboards
--
CREATE TABLE "leaderboards" (
"id" serial NOT NULL,
"name" character varying(255) NOT NULL,
"type" character varying(255) NOT NULL,
PRIMARY KEY ("id"),
CONSTRAINT "leaderboards_type" UNIQUE ("type")
);
;
--
-- Table: customers
--
CREATE TABLE "customers" (
"id" serial NOT NULL,
"entity_id" integer NOT NULL,
"display_name" character varying(255) NOT NULL,
"full_name" character varying(255) NOT NULL,
"year_of_birth" integer NOT NULL,
"postcode" character varying(16) NOT NULL,
PRIMARY KEY ("id")
);
CREATE INDEX "customers_idx_entity_id" on "customers" ("entity_id");
;
--
-- Table: leaderboard_sets
--
CREATE TABLE "leaderboard_sets" (
"id" serial NOT NULL,
"leaderboard_id" integer NOT NULL,
"date" timestamp NOT NULL,
PRIMARY KEY ("id")
);
CREATE INDEX "leaderboard_sets_idx_leaderboard_id" on "leaderboard_sets" ("leaderboard_id");
;
--
-- Table: organisations
--
CREATE TABLE "organisations" (
"id" serial NOT NULL,
"entity_id" integer NOT NULL,
"name" character varying(255) NOT NULL,
"street_name" text,
"town" character varying(255) NOT NULL,
"postcode" character varying(16),
"country" character varying(255),
"sector" character varying(1),
"pending" boolean DEFAULT false NOT NULL,
"submitted_by_id" integer,
PRIMARY KEY ("id")
);
CREATE INDEX "organisations_idx_entity_id" on "organisations" ("entity_id");
;
--
-- Table: transactions
--
CREATE TABLE "transactions" (
"id" serial NOT NULL,
"buyer_id" integer NOT NULL,
"seller_id" integer NOT NULL,
"value" numeric(100,0) NOT NULL,
"proof_image" text,
"submitted_at" timestamp NOT NULL,
"purchase_time" timestamp NOT NULL,
PRIMARY KEY ("id")
);
CREATE INDEX "transactions_idx_buyer_id" on "transactions" ("buyer_id");
CREATE INDEX "transactions_idx_seller_id" on "transactions" ("seller_id");
;
--
-- Table: users
--
CREATE TABLE "users" (
"id" serial NOT NULL,
"entity_id" integer NOT NULL,
"email" text NOT NULL,
"join_date" timestamp NOT NULL,
"password" character varying(100) NOT NULL,
"is_admin" boolean DEFAULT false NOT NULL,
PRIMARY KEY ("id"),
CONSTRAINT "users_email" UNIQUE ("email")
);
CREATE INDEX "users_idx_entity_id" on "users" ("entity_id");
;
--
-- Table: feedback
--
CREATE TABLE "feedback" (
"id" serial NOT NULL,
"user_id" integer NOT NULL,
"submitted_at" timestamp NOT NULL,
"feedbacktext" text NOT NULL,
"app_name" character varying(255) NOT NULL,
"package_name" character varying(255) NOT NULL,
"version_code" character varying(255) NOT NULL,
"version_number" character varying(255) NOT NULL,
PRIMARY KEY ("id")
);
CREATE INDEX "feedback_idx_user_id" on "feedback" ("user_id");
;
--
-- Table: session_tokens
--
CREATE TABLE "session_tokens" (
"id" serial NOT NULL,
"token" character varying(255) NOT NULL,
"user_id" integer NOT NULL,
PRIMARY KEY ("id"),
CONSTRAINT "session_tokens_token" UNIQUE ("token")
);
CREATE INDEX "session_tokens_idx_user_id" on "session_tokens" ("user_id");
;
--
-- Table: leaderboard_values
--
CREATE TABLE "leaderboard_values" (
"id" serial NOT NULL,
"entity_id" integer NOT NULL,
"set_id" integer NOT NULL,
"position" integer NOT NULL,
"value" numeric(100,0) NOT NULL,
"trend" integer DEFAULT 0 NOT NULL,
PRIMARY KEY ("id"),
CONSTRAINT "leaderboard_values_entity_id_set_id" UNIQUE ("entity_id", "set_id")
);
CREATE INDEX "leaderboard_values_idx_entity_id" on "leaderboard_values" ("entity_id");
CREATE INDEX "leaderboard_values_idx_set_id" on "leaderboard_values" ("set_id");
;
--
-- Foreign Key Definitions
--
;
ALTER TABLE "customers" ADD CONSTRAINT "customers_fk_entity_id" FOREIGN KEY ("entity_id")
REFERENCES "entities" ("id") ON DELETE CASCADE DEFERRABLE;
;
ALTER TABLE "leaderboard_sets" ADD CONSTRAINT "leaderboard_sets_fk_leaderboard_id" FOREIGN KEY ("leaderboard_id")
REFERENCES "leaderboards" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION;
;
ALTER TABLE "organisations" ADD CONSTRAINT "organisations_fk_entity_id" FOREIGN KEY ("entity_id")
REFERENCES "entities" ("id") ON DELETE CASCADE DEFERRABLE;
;
ALTER TABLE "transactions" ADD CONSTRAINT "transactions_fk_buyer_id" FOREIGN KEY ("buyer_id")
REFERENCES "entities" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION;
;
ALTER TABLE "transactions" ADD CONSTRAINT "transactions_fk_seller_id" FOREIGN KEY ("seller_id")
REFERENCES "entities" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION;
;
ALTER TABLE "users" ADD CONSTRAINT "users_fk_entity_id" FOREIGN KEY ("entity_id")
REFERENCES "entities" ("id") ON DELETE CASCADE DEFERRABLE;
;
ALTER TABLE "feedback" ADD CONSTRAINT "feedback_fk_user_id" FOREIGN KEY ("user_id")
REFERENCES "users" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION;
;
ALTER TABLE "session_tokens" ADD CONSTRAINT "session_tokens_fk_user_id" FOREIGN KEY ("user_id")
REFERENCES "users" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION;
;
ALTER TABLE "leaderboard_values" ADD CONSTRAINT "leaderboard_values_fk_entity_id" FOREIGN KEY ("entity_id")
REFERENCES "entities" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION;
;
ALTER TABLE "leaderboard_values" ADD CONSTRAINT "leaderboard_values_fk_set_id" FOREIGN KEY ("set_id")
REFERENCES "leaderboard_sets" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION;
;

15
share/ddl/PostgreSQL/upgrade/6-7/001-auto.sql Normal file
View File

@ -0,0 +1,15 @@
-- Convert schema 'share/ddl/_source/deploy/6/001-auto.yml' to 'share/ddl/_source/deploy/7/001-auto.yml':;
;
BEGIN;
;
ALTER TABLE leaderboard_values ALTER COLUMN value TYPE numeric(100,0) USING value * 100000;
;
ALTER TABLE transactions ALTER COLUMN value TYPE numeric(100,0) USING value * 100000;
;
COMMIT;

18
share/ddl/SQLite/deploy/7/001-auto-__VERSION.sql Normal file
View File

@ -0,0 +1,18 @@
--
-- Created by SQL::Translator::Producer::SQLite
-- Created on Wed Sep 13 15:24:20 2017
--
;
BEGIN TRANSACTION;
--
-- Table: dbix_class_deploymenthandler_versions
--
CREATE TABLE dbix_class_deploymenthandler_versions (
id INTEGER PRIMARY KEY NOT NULL,
version varchar(50) NOT NULL,
ddl text,
upgrade_sql text
);
CREATE UNIQUE INDEX dbix_class_deploymenthandler_versions_version ON dbix_class_deploymenthandler_versions (version);
COMMIT;

145
share/ddl/SQLite/deploy/7/001-auto.sql Normal file
View File

@ -0,0 +1,145 @@
--
-- Created by SQL::Translator::Producer::SQLite
-- Created on Wed Sep 13 15:24:20 2017
--
;
BEGIN TRANSACTION;
--
-- Table: account_tokens
--
CREATE TABLE account_tokens (
id INTEGER PRIMARY KEY NOT NULL,
name text NOT NULL,
used integer NOT NULL DEFAULT 0
);
CREATE UNIQUE INDEX account_tokens_name ON account_tokens (name);
--
-- Table: entities
--
CREATE TABLE entities (
id INTEGER PRIMARY KEY NOT NULL,
type varchar(255) NOT NULL
);
--
-- Table: leaderboards
--
CREATE TABLE leaderboards (
id INTEGER PRIMARY KEY NOT NULL,
name varchar(255) NOT NULL,
type varchar(255) NOT NULL
);
CREATE UNIQUE INDEX leaderboards_type ON leaderboards (type);
--
-- Table: customers
--
CREATE TABLE customers (
id INTEGER PRIMARY KEY NOT NULL,
entity_id integer NOT NULL,
display_name varchar(255) NOT NULL,
full_name varchar(255) NOT NULL,
year_of_birth integer NOT NULL,
postcode varchar(16) NOT NULL,
FOREIGN KEY (entity_id) REFERENCES entities(id) ON DELETE CASCADE
);
CREATE INDEX customers_idx_entity_id ON customers (entity_id);
--
-- Table: leaderboard_sets
--
CREATE TABLE leaderboard_sets (
id INTEGER PRIMARY KEY NOT NULL,
leaderboard_id integer NOT NULL,
date datetime NOT NULL,
FOREIGN KEY (leaderboard_id) REFERENCES leaderboards(id) ON DELETE NO ACTION ON UPDATE NO ACTION
);
CREATE INDEX leaderboard_sets_idx_leaderboard_id ON leaderboard_sets (leaderboard_id);
--
-- Table: organisations
--
CREATE TABLE organisations (
id INTEGER PRIMARY KEY NOT NULL,
entity_id integer NOT NULL,
name varchar(255) NOT NULL,
street_name text,
town varchar(255) NOT NULL,
postcode varchar(16),
country varchar(255),
sector varchar(1),
pending boolean NOT NULL DEFAULT false,
submitted_by_id integer,
FOREIGN KEY (entity_id) REFERENCES entities(id) ON DELETE CASCADE
);
CREATE INDEX organisations_idx_entity_id ON organisations (entity_id);
--
-- Table: transactions
--
CREATE TABLE transactions (
id INTEGER PRIMARY KEY NOT NULL,
buyer_id integer NOT NULL,
seller_id integer NOT NULL,
value numeric(100,0) NOT NULL,
proof_image text,
submitted_at datetime NOT NULL,
purchase_time datetime NOT NULL,
FOREIGN KEY (buyer_id) REFERENCES entities(id) ON DELETE NO ACTION ON UPDATE NO ACTION,
FOREIGN KEY (seller_id) REFERENCES entities(id) ON DELETE NO ACTION ON UPDATE NO ACTION
);
CREATE INDEX transactions_idx_buyer_id ON transactions (buyer_id);
CREATE INDEX transactions_idx_seller_id ON transactions (seller_id);
--
-- Table: users
--
CREATE TABLE users (
id INTEGER PRIMARY KEY NOT NULL,
entity_id integer NOT NULL,
email text NOT NULL,
join_date datetime NOT NULL,
password varchar(100) NOT NULL,
is_admin boolean NOT NULL DEFAULT false,
FOREIGN KEY (entity_id) REFERENCES entities(id) ON DELETE CASCADE
);
CREATE INDEX users_idx_entity_id ON users (entity_id);
CREATE UNIQUE INDEX users_email ON users (email);
--
-- Table: feedback
--
CREATE TABLE feedback (
id INTEGER PRIMARY KEY NOT NULL,
user_id integer NOT NULL,
submitted_at datetime NOT NULL,
feedbacktext text NOT NULL,
app_name varchar(255) NOT NULL,
package_name varchar(255) NOT NULL,
version_code varchar(255) NOT NULL,
version_number varchar(255) NOT NULL,
FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE NO ACTION ON UPDATE NO ACTION
);
CREATE INDEX feedback_idx_user_id ON feedback (user_id);
--
-- Table: session_tokens
--
CREATE TABLE session_tokens (
id INTEGER PRIMARY KEY NOT NULL,
token varchar(255) NOT NULL,
user_id integer NOT NULL,
FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE NO ACTION ON UPDATE NO ACTION
);
CREATE INDEX session_tokens_idx_user_id ON session_tokens (user_id);
CREATE UNIQUE INDEX session_tokens_token ON session_tokens (token);
--
-- Table: leaderboard_values
--
CREATE TABLE leaderboard_values (
id INTEGER PRIMARY KEY NOT NULL,
entity_id integer NOT NULL,
set_id integer NOT NULL,
position integer NOT NULL,
value numeric(100,0) NOT NULL,
trend integer NOT NULL DEFAULT 0,
FOREIGN KEY (entity_id) REFERENCES entities(id) ON DELETE NO ACTION ON UPDATE NO ACTION,
FOREIGN KEY (set_id) REFERENCES leaderboard_sets(id) ON DELETE NO ACTION ON UPDATE NO ACTION
);
CREATE INDEX leaderboard_values_idx_entity_id ON leaderboard_values (entity_id);
CREATE INDEX leaderboard_values_idx_set_id ON leaderboard_values (set_id);
CREATE UNIQUE INDEX leaderboard_values_entity_id_set_id ON leaderboard_values (entity_id, set_id);
COMMIT;

98
share/ddl/SQLite/upgrade/6-7/001-auto.sql Normal file
View File

@ -0,0 +1,98 @@
-- Convert schema 'share/ddl/_source/deploy/6/001-auto.yml' to 'share/ddl/_source/deploy/7/001-auto.yml':;
;
BEGIN;
;
CREATE TEMPORARY TABLE leaderboard_values_temp_alter (
id INTEGER PRIMARY KEY NOT NULL,
entity_id integer NOT NULL,
set_id integer NOT NULL,
position integer NOT NULL,
value decimal(16,2) NOT NULL,
trend integer NOT NULL DEFAULT 0,
FOREIGN KEY (entity_id) REFERENCES entities(id) ON DELETE NO ACTION ON UPDATE NO ACTION,
FOREIGN KEY (set_id) REFERENCES leaderboard_sets(id) ON DELETE NO ACTION ON UPDATE NO ACTION
);
;
INSERT INTO leaderboard_values_temp_alter( id, entity_id, set_id, position, value, trend) SELECT id, entity_id, set_id, position, value, trend FROM leaderboard_values;
;
DROP TABLE leaderboard_values;
;
CREATE TABLE leaderboard_values (
id INTEGER PRIMARY KEY NOT NULL,
entity_id integer NOT NULL,
set_id integer NOT NULL,
position integer NOT NULL,
value numeric(100,0) NOT NULL,
trend integer NOT NULL DEFAULT 0,
FOREIGN KEY (entity_id) REFERENCES entities(id) ON DELETE NO ACTION ON UPDATE NO ACTION,
FOREIGN KEY (set_id) REFERENCES leaderboard_sets(id) ON DELETE NO ACTION ON UPDATE NO ACTION
);
;
CREATE INDEX leaderboard_values_idx_enti00 ON leaderboard_values (entity_id);
;
CREATE INDEX leaderboard_values_idx_set_00 ON leaderboard_values (set_id);
;
CREATE UNIQUE INDEX leaderboard_values_entity_i00 ON leaderboard_values (entity_id, set_id);
;
INSERT INTO leaderboard_values SELECT id, entity_id, set_id, position, value, trend FROM leaderboard_values_temp_alter;
;
DROP TABLE leaderboard_values_temp_alter;
;
CREATE TEMPORARY TABLE transactions_temp_alter (
id INTEGER PRIMARY KEY NOT NULL,
buyer_id integer NOT NULL,
seller_id integer NOT NULL,
value decimal(16,2) NOT NULL,
proof_image text,
submitted_at datetime NOT NULL,
purchase_time datetime NOT NULL,
FOREIGN KEY (buyer_id) REFERENCES entities(id) ON DELETE NO ACTION ON UPDATE NO ACTION,
FOREIGN KEY (seller_id) REFERENCES entities(id) ON DELETE NO ACTION ON UPDATE NO ACTION
);
;
INSERT INTO transactions_temp_alter( id, buyer_id, seller_id, value, proof_image, submitted_at, purchase_time) SELECT id, buyer_id, seller_id, value, proof_image, submitted_at, purchase_time FROM transactions;
;
DROP TABLE transactions;
;
CREATE TABLE transactions (
id INTEGER PRIMARY KEY NOT NULL,
buyer_id integer NOT NULL,
seller_id integer NOT NULL,
value numeric(100,0) NOT NULL,
proof_image text,
submitted_at datetime NOT NULL,
purchase_time datetime NOT NULL,
FOREIGN KEY (buyer_id) REFERENCES entities(id) ON DELETE NO ACTION ON UPDATE NO ACTION,
FOREIGN KEY (seller_id) REFERENCES entities(id) ON DELETE NO ACTION ON UPDATE NO ACTION
);
;
CREATE INDEX transactions_idx_buyer_id02 ON transactions (buyer_id);
;
CREATE INDEX transactions_idx_seller_id02 ON transactions (seller_id);
;
INSERT INTO transactions SELECT id, buyer_id, seller_id, value * 100000, proof_image, submitted_at, purchase_time FROM transactions_temp_alter;
;
DROP TABLE transactions_temp_alter;
;
COMMIT;

91
share/ddl/_source/deploy/7/001-auto-__VERSION.yml Normal file
View File

@ -0,0 +1,91 @@
---
schema:
procedures: {}
tables:
dbix_class_deploymenthandler_versions:
constraints:
- deferrable: 1
expression: ''
fields:
- id
match_type: ''
name: ''
on_delete: ''
on_update: ''
options: []
reference_fields: []
reference_table: ''
type: PRIMARY KEY
- deferrable: 1
expression: ''
fields:
- version
match_type: ''
name: dbix_class_deploymenthandler_versions_version
on_delete: ''
on_update: ''
options: []
reference_fields: []
reference_table: ''
type: UNIQUE
fields:
ddl:
data_type: text
default_value: ~
is_nullable: 1
is_primary_key: 0
is_unique: 0
name: ddl
order: 3
size:
- 0
id:
data_type: int
default_value: ~
is_auto_increment: 1
is_nullable: 0
is_primary_key: 1
is_unique: 0
name: id
order: 1
size:
- 0
upgrade_sql:
data_type: text
default_value: ~
is_nullable: 1
is_primary_key: 0
is_unique: 0
name: upgrade_sql
order: 4
size:
- 0
version:
data_type: varchar
default_value: ~
is_nullable: 0
is_primary_key: 0
is_unique: 1
name: version
order: 2
size:
- 50
indices: []
name: dbix_class_deploymenthandler_versions
options: []
order: 1
triggers: {}
views: {}
translator:
add_drop_table: 0
filename: ~
no_comments: 0
parser_args:
sources:
- __VERSION
parser_type: SQL::Translator::Parser::DBIx::Class
producer_args: {}
producer_type: SQL::Translator::Producer::YAML
show_warnings: 0
trace: 0
version: 0.11021

1064
share/ddl/_source/deploy/7/001-auto.yml Normal file
View File

File diff suppressed because it is too large Load Diff

2
t/admin/organisation.t
View File

@ -30,7 +30,7 @@ my $pending_entity = $schema->resultset('Entity')->create({
town => 'Midgar',
sector => 'A',
postcode => 'WC1E 6AD',
pending => \"1",
pending => 1,
},
type => "organisation",
});

146
t/api/feedback.t Normal file
View File

@ -0,0 +1,146 @@
use Mojo::Base -strict;
use FindBin qw/ $Bin /;
use Test::More;
use Mojo::JSON;
use Test::Pear::LocalLoop;
my $framework = Test::Pear::LocalLoop->new(
etc_dir => "$Bin/../etc",
);
$framework->install_fixtures('users');
my $t = $framework->framework;
my $schema = $t->app->schema;
#test email errors
$t->post_ok('/api/feedback' => json => {
email => '',
feedbacktext => 'banana',
app_name => 'Foodloop Web',
package_name => 'Foodloop Web',
version_code => 'dev',
version_number => 'dev',
})
->status_is(400)
->json_is('/success', Mojo::JSON->false)
->json_like('/message', qr/Email is required or not registered/);
$t->post_ok('/api/feedback' => json => {
feedbacktext => 'banana',
app_name => 'Foodloop Web',
package_name => 'Foodloop Web',
version_code => 'dev',
version_number => 'dev',
})
->status_is(400)->or($framework->dump_error)
->json_is('/success', Mojo::JSON->false)
->json_like('/message', qr/Email is required or not registered/);
$t->post_ok('/api/feedback' => json => {
email => 'banana',
feedbacktext => 'banana',
app_name => 'Foodloop Web',
package_name => 'Foodloop Web',
version_code => 'dev',
version_number => 'dev',
})
->status_is(400)->or($framework->dump_error)
->json_is('/success', Mojo::JSON->false)
->json_like('/message', qr/Email is required or not registered/);
$t->post_ok('/api/feedback' => json => {
email => 'test21318432148@example.com',
feedbacktext => 'banana',
app_name => 'Foodloop Web',
package_name => 'Foodloop Web',
version_code => 'dev',
version_number => 'dev',
})
->status_is(400)->or($framework->dump_error)
->json_is('/success', Mojo::JSON->false)
->json_like('/message', qr/Email is required or not registered/);
# Test for missing feedback
$t->post_ok('/api/feedback' => json => {
email => 'test1@example.com',
app_name => 'Foodloop Web',
package_name => 'Foodloop Web',
version_code => 'dev',
version_number => 'dev',
})
->status_is(400)->or($framework->dump_error)
->json_is('/success', Mojo::JSON->false)
->json_like('/message', qr/Feedback is required/);
$t->post_ok('/api/feedback' => json => {
email => 'test1@example.com',
feedbacktext => '',
app_name => 'Foodloop Web',
package_name => 'Foodloop Web',
version_code => 'dev',
version_number => 'dev',
})
->status_is(400)->or($framework->dump_error)
->json_is('/success', Mojo::JSON->false)
->json_like('/message', qr/Feedback is required/);
# Test for missing extra details
$t->post_ok('/api/feedback' => json => {
email => 'test1@example.com',
feedbacktext => 'banana',
package_name => 'Foodloop Web',
version_code => 'dev',
version_number => 'dev',
})
->status_is(400)->or($framework->dump_error)
->json_is('/success', Mojo::JSON->false)
->json_like('/message', qr/App Name is required/);
$t->post_ok('/api/feedback' => json => {
email => 'test1@example.com',
feedbacktext => 'banana',
app_name => 'Foodloop Web',
version_code => 'dev',
version_number => 'dev',
})
->status_is(400)->or($framework->dump_error)
->json_is('/success', Mojo::JSON->false)
->json_like('/message', qr/Package Name is required/);
$t->post_ok('/api/feedback' => json => {
email => 'test1@example.com',
feedbacktext => 'banana',
app_name => 'Foodloop Web',
package_name => 'Foodloop Web',
version_number => 'dev',
})
->status_is(400)->or($framework->dump_error)
->json_is('/success', Mojo::JSON->false)
->json_like('/message', qr/Version Code is required/);
$t->post_ok('/api/feedback' => json => {
email => 'test1@example.com',
feedbacktext => 'banana',
app_name => 'Foodloop Web',
package_name => 'Foodloop Web',
version_code => 'dev',
})
->status_is(400)->or($framework->dump_error)
->json_is('/success', Mojo::JSON->false)
->json_like('/message', qr/Version Number is required/);
# Valid Feedback
$t->post_ok('/api/feedback' => json => {
email => 'test1@example.com',
feedbacktext => 'banana',
app_name => 'Foodloop Web',
package_name => 'Foodloop Web',
version_code => 'dev',
version_number => 'dev',
})
->status_is(200)->or($framework->dump_error)
->json_is('/success', Mojo::JSON->true);
done_testing;

12
t/api/register.t
View File

@ -73,7 +73,7 @@ $testJson = {
$t->post_ok('/api/register' => json => $testJson)
->status_is(400)
->json_is('/success', Mojo::JSON->false)
->content_like(qr/no name sent/i);
->content_like(qr/no display name sent/i);
#name missing JSON
$testJson = {
'usertype' => 'customer',
@ -87,7 +87,7 @@ $testJson = {
$t->post_ok('/api/register' => json => $testJson)
->status_is(400)
->json_is('/success', Mojo::JSON->false)
->content_like(qr/no name sent/i);
->content_like(qr/no full name sent/i);
#Blank name
$testJson = {
@ -235,7 +235,7 @@ $t->post_ok('/api/register' => json => $testJson)
->status_is(403)
->json_is('/success', Mojo::JSON->false)
->content_like(qr/email/i)
->content_like(qr/exists/i);
->content_like(qr/already in use/i);
#postcode missing JSON
$testJson = {
@ -315,7 +315,7 @@ $testJson = {
$t->post_ok('/api/register' => json => $testJson)
->status_is(400)
->json_is('/success', Mojo::JSON->false)
->content_like(qr/no year_of_birth sent/i);
->content_like(qr/no year of birth sent/i);
#Age is invalid
$testJson = {
@ -331,7 +331,7 @@ $testJson = {
$t->post_ok('/api/register' => json => $testJson)
->status_is(400)
->json_is('/success', Mojo::JSON->false)
->content_like(qr/year_of_birth/i)
->content_like(qr/year of birth/i)
->content_like(qr/invalid/i);
#full address missing JSON
@ -347,7 +347,7 @@ $testJson = {
$t->post_ok('/api/register' => json => $testJson)
->status_is(400)
->json_is('/success', Mojo::JSON->false)
->content_like(qr/no street_name sent/i);
->content_like(qr/no street name sent/i);
#TODO Validation of full address

14
t/api/stats.t
View File

@ -43,7 +43,7 @@ $t->post_ok('/api/stats' => json => { session_key => $session_key } )
for ( 1 .. 10 ) {
$user_result->create_related( 'purchases', {
seller_id => $org_result->id,
value => $_,
value => $_ * 100000,
proof_image => 'a',
});
}
@ -51,7 +51,7 @@ for ( 1 .. 10 ) {
for ( 11 .. 20 ) {
$user_result->create_related( 'purchases', {
seller_id => $org_result->id,
value => $_,
value => $_ * 100000,
proof_image => 'a',
purchase_time => $dtf->format_datetime(DateTime->today()->subtract( days => 5 )),
});
@ -60,7 +60,7 @@ for ( 11 .. 20 ) {
for ( 21 .. 30 ) {
$user_result->create_related( 'purchases', {
seller_id => $org_result->id,
value => $_,
value => $_ * 100000,
proof_image => 'a',
purchase_time => $dtf->format_datetime(DateTime->today()->subtract( days => 25 )),
});
@ -69,7 +69,7 @@ for ( 21 .. 30 ) {
for ( 31 .. 40 ) {
$user_result->create_related( 'purchases', {
seller_id => $org_result->id,
value => $_,
value => $_ * 100000,
proof_image => 'a',
purchase_time => $dtf->format_datetime(DateTime->today()->subtract( days => 50 )),
});
@ -78,7 +78,7 @@ for ( 31 .. 40 ) {
for ( 41 .. 50 ) {
$org_result->create_related( 'purchases', {
seller_id => $org_result->id,
value => $_,
value => $_ * 100000,
proof_image => 'a',
purchase_time => $dtf->format_datetime(DateTime->today()->subtract( days => 50 )),
});
@ -91,8 +91,8 @@ is $user_result->purchases->search({
$dtf->format_datetime(DateTime->today()->add( days => 1 )),
],
},
})->get_column('value')->sum, 55, 'Got correct sum';
is $user_result->purchases->today_rs->get_column('value')->sum, 55, 'Got correct sum through rs';
})->get_column('value')->sum, 5500000, 'Got correct sum';
is $user_result->purchases->today_rs->get_column('value')->sum, 5500000, 'Got correct sum through rs';
$t->post_ok('/api/stats' => json => { session_key => $session_key } )
->status_is(200)

16
t/api/stats_leaderboards.t
View File

@ -80,13 +80,13 @@ my $now = DateTime->today();
$user_result->create_related( 'purchases', {
seller_id => $org_result->id,
value => 1,
value => 100000,
proof_image => 'a',
});
$user_result->create_related( 'purchases', {
seller_id => $org_result->id,
value => 9,
value => 900000,
proof_image => 'a',
purchase_time => $dtf->format_datetime($now->clone->subtract( days => 1 )),
});
@ -97,13 +97,13 @@ my $now = DateTime->today();
$user_result->create_related( 'purchases', {
seller_id => $org_result->id,
value => 3,
value => 300000,
proof_image => 'a',
});
$user_result->create_related( 'purchases', {
seller_id => $org_result->id,
value => 1,
value => 100000,
proof_image => 'a',
purchase_time => $dtf->format_datetime($now->clone->subtract( days => 1 )),
});
@ -114,13 +114,13 @@ my $now = DateTime->today();
$user_result->create_related( 'purchases', {
seller_id => $org_result->id,
value => 5,
value => 500000,
proof_image => 'a',
});
$user_result->create_related( 'purchases', {
seller_id => $org_result->id,
value => 5,
value => 500000,
proof_image => 'a',
purchase_time => $dtf->format_datetime($now->clone->subtract( days => 1 )),
});
@ -131,13 +131,13 @@ my $now = DateTime->today();
$user_result->create_related( 'purchases', {
seller_id => $org_result->id,
value => 9,
value => 900000,
proof_image => 'a',
});
$user_result->create_related( 'purchases', {
seller_id => $org_result->id,
value => 3,
value => 300000,
proof_image => 'a',
purchase_time => $dtf->format_datetime($now->clone->subtract( days => 1 )),
});

28
t/api/upload.t
View File

@ -123,7 +123,7 @@ $upload = {json => Mojo::JSON::encode_json($json), file => {file => './t/test.jp
$t->post_ok('/api/upload' => form => $upload )
->status_is(400)
->json_is('/success', Mojo::JSON->false)
->content_like(qr/transaction_value is missing/i);
->content_like(qr/transaction amount is missing/i);
print "test 7 - transaction_value non-numbers\n";
$json = {
@ -137,7 +137,7 @@ $upload = {json => Mojo::JSON::encode_json($json), file => {file => './t/test.jp
$t->post_ok('/api/upload' => form => $upload )
->status_is(400)
->json_is('/success', Mojo::JSON->false)
->content_like(qr/transaction_value does not look like a number/i);
->content_like(qr/transaction amount does not look like a number/i);
print "test 8 - transaction_value equal to zero\n";
$json = {
@ -151,7 +151,7 @@ $upload = {json => Mojo::JSON::encode_json($json), file => {file => './t/test.jp
$t->post_ok('/api/upload' => form => $upload )
->status_is(400)
->json_is('/success', Mojo::JSON->false)
->content_like(qr/transaction_value cannot be equal to or less than zero/i);
->content_like(qr/transaction amount cannot be equal to or less than zero/i);
print "test 9 - transaction_value less than zero\n";
$json = {
@ -165,7 +165,7 @@ $upload = {json => Mojo::JSON::encode_json($json), file => {file => './t/test.jp
$t->post_ok('/api/upload' => form => $upload )
->status_is(400)
->json_is('/success', Mojo::JSON->false)
->content_like(qr/transaction_value cannot be equal to or less than zero/i);
->content_like(qr/transaction amount cannot be equal to or less than zero/i);
print "test 10 - transaction_type missing\n";
$json = {
@ -177,7 +177,7 @@ $upload = {json => Mojo::JSON::encode_json($json), file => {file => './t/test.jp
$t->post_ok('/api/upload' => form => $upload )
->status_is(400)
->json_is('/success', Mojo::JSON->false)
->content_like(qr/transaction_type is missing/i);
->content_like(qr/transaction type is missing/i);
print "test 11 - transaction_type invalid.\n";
$json = {
@ -191,7 +191,7 @@ $upload = {json => Mojo::JSON::encode_json($json), file => {file => './t/test.jp
$t->post_ok('/api/upload' => form => $upload )
->status_is(400)
->json_is('/success', Mojo::JSON->false)
->content_like(qr/transaction_type is not a valid value/i);
->content_like(qr/transaction type is not a valid value/i);
print "test 12 - file not uploaded.\n";
$json = {
@ -220,7 +220,7 @@ $upload = {json => Mojo::JSON::encode_json($json), file => {file => './t/test.jp
$t->post_ok('/api/upload' => form => $upload )
->status_is(400)
->json_is('/success', Mojo::JSON->false)
->content_like(qr/organisation_id is missing/i);
->content_like(qr/organisation ID is missing/i);
print "test 14 - organisation_id for non-existent id. (type 1: already validated)\n";
$json = {
@ -234,7 +234,7 @@ $upload = {json => Mojo::JSON::encode_json($json), file => {file => './t/test.jp
$t->post_ok('/api/upload' => form => $upload )
->status_is(400)
->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);
print "test 15 - valid addition. (type 1: already validated)\n";
is $schema->resultset('Transaction')->count, 1, "1 transaction";
@ -268,7 +268,7 @@ $upload = {json => Mojo::JSON::encode_json($json), file => {file => './t/test.jp
$t->post_ok('/api/upload' => form => $upload )
->status_is(400)
->json_is('/success', Mojo::JSON->false)
->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";
is $schema->resultset('Organisation')->search({ pending => 1 })->count, 0, "No pending organisations";
@ -306,7 +306,7 @@ $t->post_ok('/api/upload' => form => $upload )
->status_is(400)
->or($framework->dump_error)
->json_is('/success', Mojo::JSON->false)
->content_like(qr/organisation_id is missing/i);
->content_like(qr/organisation ID is missing/i);
print "test 19 - organisation_id not a number (type 2: existing organisation)\n";
$json = {
@ -320,7 +320,7 @@ $upload = {json => Mojo::JSON::encode_json($json), file => {file => './t/test.jp
$t->post_ok('/api/upload' => form => $upload )
->status_is(400)
->json_is('/success', Mojo::JSON->false)
->content_like(qr/organisation_id is not a number/i);
->content_like(qr/organisation ID is not a number/i);
print "test 20 - id does not exist (type 2: existing organisation)\n";
$json = {
@ -334,7 +334,7 @@ $upload = {json => Mojo::JSON::encode_json($json), file => {file => './t/test.jp
$t->post_ok('/api/upload' => form => $upload )
->status_is(400)
->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);
print "test 21 - purchase_time is missing\n";
is $schema->resultset('Organisation')->search({ pending => 1 })->entity->sales->count, 1, "1 pending transactions";
@ -385,7 +385,7 @@ $upload = {json => Mojo::JSON::encode_json($json), file => {file => './t/test.jp
$t->post_ok('/api/upload' => form => $upload )
->status_is(400)
->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('Organisation')->search({ pending => 1 })->entity->sales->count, 1, "1 pending transactions";
print "test 25 - Logout Hojo\n";
@ -475,7 +475,7 @@ $upload = {json => Mojo::JSON::encode_json($json), file => {file => './t/test.jp
$t->post_ok('/api/upload' => form => $upload )
->status_is(400)
->json_is('/success', Mojo::JSON->false)
->json_like('/message', qr/organisation_id does not exist in the database/);
->json_like('/message', qr/organisation ID does not exist in the database/);
is $schema->resultset('Transaction')->count, 6, "6 transaction";
done_testing();

22
t/api/user.t
View File

@ -32,28 +32,6 @@ my $session_key = $framework->login({
password => $password,
});
my $json_no_date = { session_key => $session_key };
$t->post_ok('/api/user/day', json => $json_no_date)
->status_is(200)->or($framework->dump_error)
->json_is('/success', Mojo::JSON->true);
my $json_invalid_date = {
session_key => $session_key,
day => 'invalid',
};
$t->post_ok('/api/user/day', json => $json_invalid_date)
->status_is(400)->or($framework->dump_error)
->json_is('/success', Mojo::JSON->false)
->json_like('/message', qr/Invalid ISO8601 Datetime/);
my $json_valid_date = {
session_key => $session_key,
day => $t->app->datetime_formatter->format_datetime(DateTime->now),
};
$t->post_ok('/api/user/day', json => $json_valid_date)
->status_is(200)->or($framework->dump_error)
->json_is('/success', Mojo::JSON->true);
$t->post_ok('/api/user', json => { session_key => $session_key })
->status_is(200)->or($framework->dump_error)
->json_is({

14
t/api/v1/organisation/graphs.t
View File

@ -78,6 +78,18 @@ $t->post_ok('/api/v1/organisation/graphs' => json => {
data => [ 40, 20, 30, 30, 40, 10, 40, 30, 30, 20, 40, 20, 40, 20, 30, 30, 40, 10, 40, 30, 30, 20, 40, 20, 40, 20, 30, 30, 40, 10 ],
});
$t->post_ok('/api/v1/organisation/graphs' => json => {
session_key => $session_key,
graph => 'customers_range',
start => $start->clone->subtract( days => 8 )->ymd,
end => $start->clone->ymd,
})
->status_is(200)->or($framework->dump_error)
->json_is('/graph', {
labels => [ map { $start->clone->subtract( days => $_ )->ymd } reverse ( 0 .. 8 ) ],
data => [ 2, 4, 2, 4, 2, 3, 3, 4, 1 ],
});
$framework->logout( $session_key );
$session_key = $framework->login({
@ -103,7 +115,7 @@ sub create_random_transaction {
$schema->resultset('Transaction')->create({
buyer => $buyer_result,
seller => $seller_result,
value => 10,
value => 10 * 100000,
proof_image => 'a',
purchase_time => $time,
});

2
t/api/v1/organisation/snippets.t
View File

@ -73,7 +73,7 @@ sub create_random_transaction {
$schema->resultset('Transaction')->create({
buyer => $buyer_result,
seller => $seller_result,
value => 10,
value => 10 * 100000,
proof_image => 'a',
purchase_time => $time,
});