From 37ffd53054dc649a576e8056160a855c4f22f040 Mon Sep 17 00:00:00 2001 From: Finn Date: Tue, 13 Mar 2018 12:55:13 +0000 Subject: [PATCH 01/12] amended upload to allow for validation changes --- .../LocalLoop/Controller/Api/Transactions.pm | 19 ++++++++++++++++++- lib/Pear/LocalLoop/Controller/Api/Upload.pm | 6 +++--- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/lib/Pear/LocalLoop/Controller/Api/Transactions.pm b/lib/Pear/LocalLoop/Controller/Api/Transactions.pm index 4a0ae8c..9273c2d 100644 --- a/lib/Pear/LocalLoop/Controller/Api/Transactions.pm +++ b/lib/Pear/LocalLoop/Controller/Api/Transactions.pm @@ -30,7 +30,11 @@ sub post_transaction_list_purchases { }, ); -# purchase_time needs timezone attached to it + my $recurring_transactions = $c->schema->resultset('TransactionRecurring')->search({ + buyer_id => $user->id, + }); + + # purchase_time needs timezone attached to it my @transaction_list = ( map {{ seller => $_->seller->name, @@ -39,9 +43,22 @@ sub post_transaction_list_purchases { }} $transactions->all ); + my @recurring_transaction_list = ( + map {{ + seller => $_->seller->name, + value => $_->value / 100000, + start_time => $c->format_iso_datetime($_->start_time), + last_updated => $c->format_iso_datetime($_->last_updated), + essential => $_->essential, + category => $_->category->category->name, + recurring_period => $_->recurring_period, + }} $recurring_transactions->all + ); + return $c->render( json => { success => Mojo::JSON->true, transactions => \@transaction_list, + recurring_transactions => \@recurring_transaction_list, page_no => $transactions->pager->total_entries, }); } diff --git a/lib/Pear/LocalLoop/Controller/Api/Upload.pm b/lib/Pear/LocalLoop/Controller/Api/Upload.pm index dea5678..61f1d2b 100644 --- a/lib/Pear/LocalLoop/Controller/Api/Upload.pm +++ b/lib/Pear/LocalLoop/Controller/Api/Upload.pm @@ -147,7 +147,7 @@ sub post_upload { # Unknown Organisation $validation->required('organisation_name'); $validation->optional('street_name'); - $validation->required('town'); + $validation->optional('town'); $validation->optional('postcode')->postcode; return $c->api_validation_error if $validation->has_error; @@ -198,7 +198,7 @@ sub post_upload { ( defined $file ? ( proof_image => $file ) : () ), purchase_time => $c->format_db_datetime($purchase_time), essential => ( defined $essential ? $essential : 0 ), - distance => $distance, + distance => ( defined $category ? $category : undef ), } ); @@ -227,7 +227,7 @@ sub post_upload { value => $transaction_value * 100000, start_time => $c->format_db_datetime($purchase_time), essential => ( defined $essential ? $essential : 0 ), - distance => $distance, + distance => ( defined $category ? $category : undef ), category_id => ( defined $category ? $category : undef ), recurring_period => $recurring_period, }); From bd36405fa8bda7da760226bb0468ed675ab46b91 Mon Sep 17 00:00:00 2001 From: Finn Date: Wed, 14 Mar 2018 17:55:24 +0000 Subject: [PATCH 02/12] amended api for recurring transaction list --- lib/Pear/LocalLoop/Controller/Api/Transactions.pm | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/lib/Pear/LocalLoop/Controller/Api/Transactions.pm b/lib/Pear/LocalLoop/Controller/Api/Transactions.pm index 9273c2d..8f4f2d0 100644 --- a/lib/Pear/LocalLoop/Controller/Api/Transactions.pm +++ b/lib/Pear/LocalLoop/Controller/Api/Transactions.pm @@ -45,12 +45,13 @@ sub post_transaction_list_purchases { my @recurring_transaction_list = ( map {{ + id => $_->id, seller => $_->seller->name, value => $_->value / 100000, start_time => $c->format_iso_datetime($_->start_time), last_updated => $c->format_iso_datetime($_->last_updated), essential => $_->essential, - category => $_->category->category->name, + category => ( defined $_->category ? $_->category->name : 'Uncategorised' ), recurring_period => $_->recurring_period, }} $recurring_transactions->all ); @@ -63,4 +64,16 @@ sub post_transaction_list_purchases { }); } +sub update_recurring { + my $c = shift; + + my $user = $c->stash->{api_user}; + + my $validation = $c->validation; + + $validation->input( $c->stash->{api_json} ); + #TODO check that user matches seller on database before updating for that id + +} + 1; From dfdf4b8104874de933e6f36fd809e2264ff183fc Mon Sep 17 00:00:00 2001 From: Finn Date: Wed, 14 Mar 2018 19:38:05 +0000 Subject: [PATCH 03/12] fixed critical bugs introduced earlier and changed category viewing --- lib/Pear/LocalLoop/Controller/Api/Upload.pm | 22 ++++++++++++--------- lib/Pear/LocalLoop/Plugin/Datetime.pm | 1 + 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/lib/Pear/LocalLoop/Controller/Api/Upload.pm b/lib/Pear/LocalLoop/Controller/Api/Upload.pm index 61f1d2b..dea1f10 100644 --- a/lib/Pear/LocalLoop/Controller/Api/Upload.pm +++ b/lib/Pear/LocalLoop/Controller/Api/Upload.pm @@ -198,7 +198,7 @@ sub post_upload { ( defined $file ? ( proof_image => $file ) : () ), purchase_time => $c->format_db_datetime($purchase_time), essential => ( defined $essential ? $essential : 0 ), - distance => ( defined $category ? $category : undef ), + distance => $distance, } ); @@ -227,7 +227,7 @@ sub post_upload { value => $transaction_value * 100000, start_time => $c->format_db_datetime($purchase_time), essential => ( defined $essential ? $essential : 0 ), - distance => ( defined $category ? $category : undef ), + distance => $distance, category_id => ( defined $category ? $category : undef ), recurring_period => $recurring_period, }); @@ -243,18 +243,22 @@ sub post_category { my $c = shift; my $self = $c; - my $categories = { ids => [], names => [] }; - my $category_rs = $c->schema->resultset('Category'); - for ( $category_rs->all ) { - push @{ $categories->{ ids } }, $_->get_column('id'); - push @{ $categories->{ names } }, $_->get_column('name'); - } + # for ( $category_rs->all ) { + # push @{ $categories->{ ids } }, $_->get_column('id'); + # push @{ $categories->{ names } }, $_->get_column('name'); + # } + my @category_list = ( + map {{ + id => $_->id, + name => $_->name, + }} $category_rs->all + ); return $self->render( json => { success => Mojo::JSON->true, - categories => $categories, + categories => \@category_list, }); } diff --git a/lib/Pear/LocalLoop/Plugin/Datetime.pm b/lib/Pear/LocalLoop/Plugin/Datetime.pm index 1f79e45..c6f2e55 100644 --- a/lib/Pear/LocalLoop/Plugin/Datetime.pm +++ b/lib/Pear/LocalLoop/Plugin/Datetime.pm @@ -66,6 +66,7 @@ sub register { $app->helper( format_iso_datetime => sub { my ( $c, $datetime_obj ) = @_; + return unless defined $datetime_obj; return $c->iso_datetime_parser->format_datetime( $datetime_obj, ); From e75cc907f942fcfd4154845bd275b03c3787af8d Mon Sep 17 00:00:00 2001 From: Finn Date: Thu, 15 Mar 2018 13:06:50 +0000 Subject: [PATCH 04/12] amended transactionlist code --- lib/Pear/LocalLoop/Controller/Api/Transactions.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/Pear/LocalLoop/Controller/Api/Transactions.pm b/lib/Pear/LocalLoop/Controller/Api/Transactions.pm index 8f4f2d0..a2458d6 100644 --- a/lib/Pear/LocalLoop/Controller/Api/Transactions.pm +++ b/lib/Pear/LocalLoop/Controller/Api/Transactions.pm @@ -42,16 +42,16 @@ sub post_transaction_list_purchases { purchase_time => $c->format_iso_datetime($_->purchase_time), }} $transactions->all ); - + my @recurring_transaction_list = ( map {{ id => $_->id, seller => $_->seller->name, value => $_->value / 100000, start_time => $c->format_iso_datetime($_->start_time), - last_updated => $c->format_iso_datetime($_->last_updated), + last_updated => $c->format_iso_datetime($_->last_updated) || undef, essential => $_->essential, - category => ( defined $_->category ? $_->category->name : 'Uncategorised' ), + category => $_->category_id, recurring_period => $_->recurring_period, }} $recurring_transactions->all ); From 4affc1bd54c828aa2409da06d137b7ea4c789f7f Mon Sep 17 00:00:00 2001 From: Finn Date: Tue, 20 Mar 2018 12:19:04 +0000 Subject: [PATCH 05/12] fixed to category viewing and recurring transaction data --- lib/Pear/LocalLoop/Controller/Api/Categories.pm | 2 +- lib/Pear/LocalLoop/Controller/Api/Transactions.pm | 4 ++-- lib/Pear/LocalLoop/Controller/Api/Upload.pm | 11 +++++------ 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/lib/Pear/LocalLoop/Controller/Api/Categories.pm b/lib/Pear/LocalLoop/Controller/Api/Categories.pm index 9913f42..95f9db5 100644 --- a/lib/Pear/LocalLoop/Controller/Api/Categories.pm +++ b/lib/Pear/LocalLoop/Controller/Api/Categories.pm @@ -43,7 +43,7 @@ sub post_category_list { for my $cat_trans ( $month_transaction_category_rs->all ) { my $quantised = $c->db_datetime_parser->parse_datetime($cat_trans->get_column('quantised')); my $days = $c->format_iso_date( $quantised ) || 0; - my $category = $cat_trans->get_column('category_id') || 0; + my $category = $cat_trans->get_column('category_id') || undef; my $value = ($cat_trans->get_column('value') || 0) / 100000; $data->{categories}->{$days} = [] unless exists $data->{categories}->{$days}; push @{ $data->{categories}->{$days} }, { diff --git a/lib/Pear/LocalLoop/Controller/Api/Transactions.pm b/lib/Pear/LocalLoop/Controller/Api/Transactions.pm index a2458d6..e5bbc94 100644 --- a/lib/Pear/LocalLoop/Controller/Api/Transactions.pm +++ b/lib/Pear/LocalLoop/Controller/Api/Transactions.pm @@ -42,7 +42,7 @@ sub post_transaction_list_purchases { purchase_time => $c->format_iso_datetime($_->purchase_time), }} $transactions->all ); - + my @recurring_transaction_list = ( map {{ id => $_->id, @@ -51,7 +51,7 @@ sub post_transaction_list_purchases { start_time => $c->format_iso_datetime($_->start_time), last_updated => $c->format_iso_datetime($_->last_updated) || undef, essential => $_->essential, - category => $_->category_id, + category => $_->category_id || 0, recurring_period => $_->recurring_period, }} $recurring_transactions->all ); diff --git a/lib/Pear/LocalLoop/Controller/Api/Upload.pm b/lib/Pear/LocalLoop/Controller/Api/Upload.pm index dea1f10..31fa234 100644 --- a/lib/Pear/LocalLoop/Controller/Api/Upload.pm +++ b/lib/Pear/LocalLoop/Controller/Api/Upload.pm @@ -249,16 +249,15 @@ sub post_category { # push @{ $categories->{ ids } }, $_->get_column('id'); # push @{ $categories->{ names } }, $_->get_column('name'); # } - my @category_list = ( - map {{ - id => $_->id, - name => $_->name, - }} $category_rs->all + my %category_list = ( + map { + $_->id => $_->name, + } $category_rs->all ); return $self->render( json => { success => Mojo::JSON->true, - categories => \@category_list, + categories => \%category_list, }); } From 504fec520718ae2fdd9d2916996d131c9dc32f9c Mon Sep 17 00:00:00 2001 From: Finn Date: Tue, 20 Mar 2018 18:43:00 +0000 Subject: [PATCH 06/12] added deleting and updating transactions --- lib/Pear/LocalLoop.pm | 2 + .../LocalLoop/Controller/Api/Transactions.pm | 94 ++++++++++++++++++- 2 files changed, 94 insertions(+), 2 deletions(-) diff --git a/lib/Pear/LocalLoop.pm b/lib/Pear/LocalLoop.pm index 5bd5e26..c996567 100644 --- a/lib/Pear/LocalLoop.pm +++ b/lib/Pear/LocalLoop.pm @@ -154,6 +154,8 @@ sub startup { $api->post('/stats/leaderboard')->to('api-stats#post_leaderboards'); $api->post('/stats/leaderboard/paged')->to('api-stats#post_leaderboards_paged'); $api->post('/outgoing-transactions')->to('api-transactions#post_transaction_list_purchases'); + $api->post('/recurring-transactions')->to('api-transactions#update_recurring'); + $api->post('/recurring-transactions/delete')->to('api-transactions#delete_recurring'); my $api_v1 = $api->under('/v1'); diff --git a/lib/Pear/LocalLoop/Controller/Api/Transactions.pm b/lib/Pear/LocalLoop/Controller/Api/Transactions.pm index e5bbc94..e2c4c18 100644 --- a/lib/Pear/LocalLoop/Controller/Api/Transactions.pm +++ b/lib/Pear/LocalLoop/Controller/Api/Transactions.pm @@ -8,6 +8,21 @@ has error_messages => sub { required => { message => 'No email sent.', status => 400 }, email => { message => 'Email is invalid.', status => 400 }, }, + value => { + 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 }, + }, + apply_time => { + required => { message => 'purchase time is missing', status => 400 }, + is_full_iso_datetime => { message => 'time is in incorrect format', status => 400 }, + }, + id => { + required => { message => 'Recurring Transaction not found', status => 400 }, + }, + category => { + in_resultset => { message => 'Category is invalid', status => 400 }, + }, }; }; @@ -70,9 +85,84 @@ sub update_recurring { my $user = $c->stash->{api_user}; my $validation = $c->validation; - $validation->input( $c->stash->{api_json} ); - #TODO check that user matches seller on database before updating for that id + $validation->required('id'); + + return $c->api_validation_error if $validation->has_error; + + my $id = $validation->param('id'); + + my $recur_transaction = $c->schema->resultset('TransactionRecurring')->find($id); + unless ( $recur_transaction ) { + return $c->render( + json => { + success => Mojo::JSON->false, + message => 'Error Finding Recurring Transaction', + error => 'recurring_error', + }, + status => 400, + ); + } + + $validation->required('recurring_period'); + $validation->required('apply_time')->is_full_iso_datetime; + $validation->optional('category')->in_resultset( 'id', $c->schema->resultset('Category')); + $validation->optional('essential'); + $validation->required('value'); + + return $c->api_validation_error if $validation->has_error; + + my $apply_time = $c->parse_iso_datetime($validation->param('apply_time')); + + $c->schema->storage->txn_do( sub { + $recur_transaction->update({ + start_time => $c->format_db_datetime($apply_time), + last_updated => undef, + category_id => $validation->param('category'), + essential => $validation->param('essential'), + value => $validation->param('value') * 100000, + recurring_period => $validation->param('recurring_period'), + }); + }); + + return $c->render( json => { + success => Mojo::JSON->true, + message => 'Recurring Transaction Updated Successfully', + }); + +} + +sub delete_recurring { + my $c = shift; + + my $user = $c->stash->{api_user}; + + my $validation = $c->validation; + $validation->input( $c->stash->{api_json} ); + $validation->required('id'); + + return $c->api_validation_error if $validation->has_error; + + my $id = $validation->param('id'); + + my $recur_transaction = $c->schema->resultset('TransactionRecurring')->find($id); + unless ( $recur_transaction ) { + return $c->render( + json => { + success => Mojo::JSON->false, + message => 'Error Finding Recurring Transaction', + error => 'recurring_error', + }, + status => 400, + ); + } + + $recur_transaction->delete; + + return $c->render( json => { + success => Mojo::JSON->true, + message => 'Recurring Transaction Delete Successfully', + }); } From 5faca4d7921d6c1ab8307734059548511b22ff66 Mon Sep 17 00:00:00 2001 From: Finn Date: Tue, 20 Mar 2018 18:46:50 +0000 Subject: [PATCH 07/12] made tests sane --- lib/Test/Pear/LocalLoop.pm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/Test/Pear/LocalLoop.pm b/lib/Test/Pear/LocalLoop.pm index 490aa1a..deffc44 100644 --- a/lib/Test/Pear/LocalLoop.pm +++ b/lib/Test/Pear/LocalLoop.pm @@ -114,6 +114,8 @@ sub dump_error { my $self = shift; if ( my $error = $self->tx->res->dom->at('pre[id="error"]') ) { diag $error->text; + } elsif ( my $route_error = $self->tx->res->dom->at('div[id="routes"] > p') ) { + diag $route_error->content; } else { diag $self->tx->res->to_string; } From b63adc590cb130b54be8531831aeb0a9dd44e890 Mon Sep 17 00:00:00 2001 From: Finn Date: Tue, 20 Mar 2018 18:54:55 +0000 Subject: [PATCH 08/12] fixed transaction test for updating and deleting --- .../LocalLoop/Controller/Api/Transactions.pm | 2 +- t/api/transactions.t | 40 ++++++++++++++++++- 2 files changed, 39 insertions(+), 3 deletions(-) diff --git a/lib/Pear/LocalLoop/Controller/Api/Transactions.pm b/lib/Pear/LocalLoop/Controller/Api/Transactions.pm index e2c4c18..84bb0da 100644 --- a/lib/Pear/LocalLoop/Controller/Api/Transactions.pm +++ b/lib/Pear/LocalLoop/Controller/Api/Transactions.pm @@ -161,7 +161,7 @@ sub delete_recurring { return $c->render( json => { success => Mojo::JSON->true, - message => 'Recurring Transaction Delete Successfully', + message => 'Recurring Transaction Deleted Successfully', }); } diff --git a/t/api/transactions.t b/t/api/transactions.t index 849a2a8..1cd62f4 100644 --- a/t/api/transactions.t +++ b/t/api/transactions.t @@ -38,8 +38,6 @@ my $session_key = $framework->login({ password => 'abc123', }); -use Data::Dumper; - $t->post_ok('/api/outgoing-transactions' => json => { session_key => $session_key, }) @@ -50,6 +48,36 @@ $t->post_ok('/api/outgoing-transactions' => json => { ->json_has('/transactions/1/value') ->json_has('/transactions/1/purchase_time'); +my $test_purchase_time = "2017-08-14T11:29:07.965+01:00"; + +$t->post_ok('/api/recurring-transactions' => json => { + session_key => $session_key, + id => 1, + apply_time => $test_purchase_time, + essential => "false", + value => 5, + recurring_period => 'daily', + }) + ->status_is(200)->or($framework->dump_error) + ->json_is({ + success => Mojo::JSON->true, + message => 'Recurring Transaction Updated Successfully', + }); + +is $schema->resultset('TransactionRecurring')->count, 87; + +$t->post_ok('/api/recurring-transactions/delete' => json => { + session_key => $session_key, + id => 1, + }) + ->status_is(200)->or($framework->dump_error) + ->json_is({ + success => Mojo::JSON->true, + message => 'Recurring Transaction Deleted Successfully', + }); + +is $schema->resultset('TransactionRecurring')->count, 86; + sub create_random_transaction { my $buyer = shift; @@ -64,6 +92,14 @@ sub create_random_transaction { proof_image => 'a', purchase_time => $time, }); + $schema->resultset('TransactionRecurring')->create({ + buyer => $buyer_result, + seller => $seller_result, + value => 10, + start_time => $time, + essential => 1, + recurring_period => 'weekly', + }); } done_testing; From 4f703cb019a213f974908e978db67bbe9d2dad48 Mon Sep 17 00:00:00 2001 From: Finn Date: Tue, 20 Mar 2018 19:24:04 +0000 Subject: [PATCH 09/12] Amended changelog --- CHANGELOG.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f712caa..64eafb4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,15 @@ # Next Release +# v0.10.6 + +* Fixed organisation submission +* Changed category listing code +* Made transaction upload code more lenient +* Added API ability to edit and delete transactions +* Added test for above +* Made test dumping more sane + # v0.10.5 * **Admin Feature** Removed generic Transaction List, replaced with a new From be0571f90b9a97b43fa674a9eef42ee38ad618cc Mon Sep 17 00:00:00 2001 From: Finn Date: Wed, 21 Mar 2018 15:52:00 +0000 Subject: [PATCH 10/12] fixed category list on postgres --- CHANGELOG.md | 1 + .../LocalLoop/Controller/Api/Categories.pm | 4 ++-- .../ViewQuantisedTransactionCategoryPg.pm | 22 +++++++++--------- .../ViewQuantisedTransactionCategorySQLite.pm | 2 +- t/api/categories.t | 23 +++++++++---------- 5 files changed, 26 insertions(+), 26 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 64eafb4..f51a1fa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ * Added API ability to edit and delete transactions * Added test for above * Made test dumping more sane +* Fixed category view on postgres # v0.10.5 diff --git a/lib/Pear/LocalLoop/Controller/Api/Categories.pm b/lib/Pear/LocalLoop/Controller/Api/Categories.pm index 95f9db5..ed5b0c1 100644 --- a/lib/Pear/LocalLoop/Controller/Api/Categories.pm +++ b/lib/Pear/LocalLoop/Controller/Api/Categories.pm @@ -31,9 +31,9 @@ sub post_category_list { value => { sum => 'value' }, category_id => 'category_id', essential => 'essential', - } + }, ], - group_by => [ qw/ category_id quantised_weeks / ], + group_by => [ qw/ category_id quantised_weeks essential value / ], order_by => { '-desc' => 'value' }, } ); diff --git a/lib/Pear/LocalLoop/Schema/Result/ViewQuantisedTransactionCategoryPg.pm b/lib/Pear/LocalLoop/Schema/Result/ViewQuantisedTransactionCategoryPg.pm index b288c65..0d2739b 100644 --- a/lib/Pear/LocalLoop/Schema/Result/ViewQuantisedTransactionCategoryPg.pm +++ b/lib/Pear/LocalLoop/Schema/Result/ViewQuantisedTransactionCategoryPg.pm @@ -10,18 +10,18 @@ __PACKAGE__->table('view_quantised_transactions'); __PACKAGE__->result_source_instance->is_virtual(1); __PACKAGE__->result_source_instance->view_definition( qq/ -SELECT "transactions.value", - "transactions.distance", - "transactions.purchase_time", - "transactions.buyer_id", - "transactions.seller_id", - "transactions.essential", - "transaction_category.category_id", - DATE_TRUNC('hour', "transactions.purchase_time") AS "quantised_hours", - DATE_TRUNC('day', "transactions.purchase_time") AS "quantised_days", - DATE_TRUNC('week', "transactions.purchase_time") AS "quantised_weeks" +SELECT "transactions"."value", + "transactions"."distance", + "transactions"."purchase_time", + "transactions"."buyer_id", + "transactions"."seller_id", + "transactions"."essential", + "transaction_category"."category_id", + DATE_TRUNC('hour', "transactions"."purchase_time") AS "quantised_hours", + DATE_TRUNC('day', "transactions"."purchase_time") AS "quantised_days", + DATE_TRUNC('week', "transactions"."purchase_time") AS "quantised_weeks" FROM "transactions" -LEFT JOIN "transaction_category" ON "transactions.id" = "transaction_category.transaction_id" +LEFT JOIN "transaction_category" ON "transactions"."id" = "transaction_category"."transaction_id" /); 1; diff --git a/lib/Pear/LocalLoop/Schema/Result/ViewQuantisedTransactionCategorySQLite.pm b/lib/Pear/LocalLoop/Schema/Result/ViewQuantisedTransactionCategorySQLite.pm index 7992458..958ea59 100644 --- a/lib/Pear/LocalLoop/Schema/Result/ViewQuantisedTransactionCategorySQLite.pm +++ b/lib/Pear/LocalLoop/Schema/Result/ViewQuantisedTransactionCategorySQLite.pm @@ -19,7 +19,7 @@ SELECT "transactions"."value", "transaction_category"."category_id", DATETIME(STRFTIME('%Y-%m-%d %H:00:00',"transactions"."purchase_time")) AS "quantised_hours", DATETIME(STRFTIME('%Y-%m-%d 00:00:00',"transactions"."purchase_time")) AS "quantised_days", - DATETIME(STRFTIME('%Y-%m-%d 00:00:00',"transactions"."purchase_time", 'weekday 1')) AS "quantised_weeks" + DATETIME(STRFTIME('%Y-%m-%d 00:00:00',"transactions"."purchase_time", 'weekday 0','-6 days')) AS "quantised_weeks" FROM "transactions" LEFT JOIN "transaction_category" ON "transactions"."id" = "transaction_category"."transaction_id" /); diff --git a/t/api/categories.t b/t/api/categories.t index 0f48620..10d11ab 100644 --- a/t/api/categories.t +++ b/t/api/categories.t @@ -19,6 +19,11 @@ $framework->install_fixtures('users'); my $t = $framework->framework; my $schema = $t->app->schema; +$schema->resultset('Category')->create({ + id => 1, + name => 'test', +}); + set_absolute_time('2017-01-02T00:00:00Z'); my $start = DateTime->today->subtract( hours => 12 ); @@ -52,7 +57,7 @@ $t->post_ok('/api/stats/category' => json => { categories => { "2016-12-05" => [{ days => "2016-12-05", - value => 30, + value => 210, category => 1, }], "2016-12-12" => [{ @@ -62,7 +67,7 @@ $t->post_ok('/api/stats/category' => json => { }], "2016-12-19" => [{ days => "2016-12-19", - value => 220, + value => 210, category => 1, }], "2016-12-26" => [{ @@ -70,28 +75,20 @@ $t->post_ok('/api/stats/category' => json => { value => 190, category => 1, }], - "2017-01-02" => [{ - days => "2017-01-02", - value => 170, - category => 1, - }], }, essentials => { "2016-12-05" => { - value => 30, + value => 210, }, "2016-12-12" => { value => 200, }, "2016-12-19" => { - value => 220, + value => 210, }, "2016-12-26" => { value => 190, }, - "2017-01-02" => { - value => 170, - }, } })->or($framework->dump_error); @@ -99,6 +96,7 @@ sub create_random_transaction { my $buyer = shift; my $time = shift; + my $buyer_result = $schema->resultset('User')->find({ email => $buyer })->entity; my $seller_result = $schema->resultset('Organisation')->find({ name => 'Test Org' })->entity; my $test_transaction = $schema->resultset('Transaction')->create({ @@ -109,6 +107,7 @@ sub create_random_transaction { purchase_time => $time, essential => 1, }); + $schema->resultset('TransactionCategory')->create({ category_id => 1, transaction_id => $test_transaction->id, From a02c74d830733a388975b4dca34d2b63ac160543 Mon Sep 17 00:00:00 2001 From: Finn Date: Wed, 21 Mar 2018 16:01:46 +0000 Subject: [PATCH 11/12] customer stats test fixed --- .../Schema/Result/ViewQuantisedTransactionSQLite.pm | 2 +- t/api/stats.t | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/Pear/LocalLoop/Schema/Result/ViewQuantisedTransactionSQLite.pm b/lib/Pear/LocalLoop/Schema/Result/ViewQuantisedTransactionSQLite.pm index abf95dd..1c908fd 100644 --- a/lib/Pear/LocalLoop/Schema/Result/ViewQuantisedTransactionSQLite.pm +++ b/lib/Pear/LocalLoop/Schema/Result/ViewQuantisedTransactionSQLite.pm @@ -17,7 +17,7 @@ SELECT "value", "seller_id", DATETIME(STRFTIME('%Y-%m-%d %H:00:00',"purchase_time")) AS "quantised_hours", DATETIME(STRFTIME('%Y-%m-%d 00:00:00',"purchase_time")) AS "quantised_days", - DATETIME(STRFTIME('%Y-%m-%d 00:00:00',"purchase_time", 'weekday 1')) AS "quantised_weeks" + DATETIME(STRFTIME('%Y-%m-%d 00:00:00',"purchase_time",'weekday 0','-6 days')) AS "quantised_weeks" FROM "transactions" /); diff --git a/t/api/stats.t b/t/api/stats.t index 67e8705..2fa8a9a 100644 --- a/t/api/stats.t +++ b/t/api/stats.t @@ -49,11 +49,11 @@ $t->post_ok('/api/stats/customer' => json => { }) ->status_is(200)->or($framework->dump_error) ->json_is('/weeks', { - first => 2, - second => 21, + first => 20, + second => 20, max => 22, sum => 118, - count => 7, + count => 6, }) ->or($framework->dump_error) ->json_is('/sectors', { From 358c0ca99b95dc6e987e7884d91bb844d2d0c1b9 Mon Sep 17 00:00:00 2001 From: Finn Date: Wed, 21 Mar 2018 16:37:40 +0000 Subject: [PATCH 12/12] customer snippet test amended --- CHANGELOG.md | 3 ++- t/api/v1/customer/snippets.t | 18 +++++++++++++----- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f51a1fa..fb8bb99 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,7 +10,8 @@ * Added API ability to edit and delete transactions * Added test for above * Made test dumping more sane -* Fixed category view on postgres +* Fixed quantised transaction calcuations for weeks on sqlite +* Amended customer snippet, category list and customer stats tests # v0.10.5 diff --git a/t/api/v1/customer/snippets.t b/t/api/v1/customer/snippets.t index 4a3ae8c..07c3e9a 100644 --- a/t/api/v1/customer/snippets.t +++ b/t/api/v1/customer/snippets.t @@ -1,5 +1,9 @@ use Mojo::Base -strict; +BEGIN { + use Test::MockTime qw/ set_absolute_time /; +} + use FindBin qw/ $Bin /; use Test::More; @@ -15,7 +19,7 @@ $framework->install_fixtures('users'); my $t = $framework->framework; my $schema = $t->app->schema; -$t->app->schema->resultset('Leaderboard')->create_new( 'monthly_total', DateTime->now->truncate(to => 'month' )->subtract( months => 1) ); +set_absolute_time('2017-01-02T00:00:00Z'); my $start = DateTime->today->subtract( hours => 12 ); @@ -25,15 +29,19 @@ for my $count ( 0 .. 60 ) { create_random_transaction( 'test1@example.com', $trans_day ); if ( $count % 2 ) { - create_random_transaction( 'test2@example.com', $trans_day ); + create_random_transaction( 'test1@example.com', $trans_day ); } if ( $count % 3 ) { - create_random_transaction( 'test3@example.com', $trans_day ); + create_random_transaction( 'test1@example.com', $trans_day ); } if ( $count % 4 ) { - create_random_transaction( 'test4@example.com', $trans_day ); + create_random_transaction( 'test1@example.com', $trans_day ); } } +my $lb_start = $start->clone->truncate( to => 'month' )->subtract( months => 1); + +#use Devel::Dwarn; Dwarn({ $_->get_columns }) for $schema->resultset('Transaction')->all; +$schema->resultset('Leaderboard')->create_new( 'monthly_total', $lb_start ); my $session_key = $framework->login({ email => 'test1@example.com', @@ -45,7 +53,7 @@ $t->post_ok('/api/v1/customer/snippets' => json => { }) ->status_is(200)->or($framework->dump_error) ->json_is('/snippets', { - user_sum => 610, + user_sum => 1760, user_position => 1, });