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

Merge pull request #120 from Pear-Trading/finn/moregraphs

Browse source 
added graph stuff for dashboard
This commit is contained in:
Finn 2018-06-04 16:05:04 +01:00 committed by GitHub
commit 2fd0eed782
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
lib/Pear/LocalLoop/Controller/Api/Stats.pm
View file

@ -63,6 +63,8 @@ sub post_customer {
my $entity = $c->stash->{api_user}->entity; my $entity = $c->stash->{api_user}->entity;
my $purchase_rs = $entity->purchases;
my $duration_weeks = DateTime::Duration->new( weeks => 7 ); my $duration_weeks = DateTime::Duration->new( weeks => 7 );
my $end = DateTime->today; my $end = DateTime->today;
my $start_weeks = $end->clone->subtract_duration( $duration_weeks ); my $start_weeks = $end->clone->subtract_duration( $duration_weeks );
@ -106,28 +108,32 @@ sub post_customer {
count => $count, count => $count,
}; };
my $sectors = { sectors => [], purchases => [] }; my $data = { cat_total => {}, categories => {}, essentials => {}, cat_list => {} };
my $sector_purchase_rs = $entity->purchases->search({}, my $category_list = $c->schema->resultset('Category')->as_hash;
my $category_purchase_rs = $purchase_rs->search({},
{ {
join => { 'seller' => 'organisation' }, join => 'category',
columns => { columns => {
sector => "organisation.sector", category_id => "category.category_id",
count => \"COUNT(*)", value => { sum => 'value' },
}, },
group_by => "organisation.sector", group_by => "category.category_id",
order_by => { '-desc' => $c->pg_or_sqlite('count',"COUNT(*)",)},
} }
); );
for ( $sector_purchase_rs->all ) { my %cat_total_list;
push @{ $sectors->{ sectors } }, $_->get_column('sector');
push @{ $sectors->{ purchases } }, ($_->get_column('count') || 0); for ( $category_purchase_rs->all ) {
my $category = $_->get_column('category_id') || 0;
my $value = ($_->get_column('value') || 0) / 100000;
$cat_total_list{$category_list->{$category}} += $value;
} }
my $data = { cat_total => {}, categories => {}, essentials => {} }; my @cat_lists = map { { category => $_, value => $cat_total_list{$_} } } sort keys %cat_total_list;
$data->{cat_list} = [ sort { $b->{value} <=> $a->{value} } @cat_lists ];
my $purchase_rs = $entity->purchases;
my $purchase_no_essential_rs = $purchase_rs->search({ my $purchase_no_essential_rs = $purchase_rs->search({
"me.essential" => 1, "me.essential" => 1,
@ -163,8 +169,6 @@ sub post_customer {
} }
); );
my $category_list = $c->schema->resultset('Category')->as_hash;
for my $cat_trans ( $month_transaction_category_rs->all ) { for my $cat_trans ( $month_transaction_category_rs->all ) {
my $quantised = $c->db_datetime_parser->parse_datetime($cat_trans->get_column('quantised')); my $quantised = $c->db_datetime_parser->parse_datetime($cat_trans->get_column('quantised'));
my $days = $c->format_iso_date( $quantised ) || 0; my $days = $c->format_iso_date( $quantised ) || 0;
@ -189,7 +193,6 @@ sub post_customer {
success => Mojo::JSON->true, success => Mojo::JSON->true,
data => $data, data => $data,
weeks => $weeks, weeks => $weeks,
sectors => $sectors,
}); });
} }

8
t/api/stats.t
View file

@ -55,10 +55,6 @@ $t->post_ok('/api/stats/customer' => json => {
sum => 118, sum => 118,
count => 6, count => 6,
}) })
->json_is('/sectors', {
sectors => ['A'],
purchases => [118],
})
->json_is('/data', { ->json_is('/data', {
cat_total => { cat_total => {
Uncategorised => 810, Uncategorised => 810,
@ -88,6 +84,10 @@ $t->post_ok('/api/stats/customer' => json => {
cat_total => { cat_total => {
Uncategorised => 810, Uncategorised => 810,
}, },
cat_list => [{
category => "Uncategorised",
value => 1180,
}],
essentials => { essentials => {
purchase_no_essential_total => 0, purchase_no_essential_total => 0,
purchase_no_total => 118, purchase_no_total => 118,