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

sectors code added

Browse source
This commit is contained in:
Finn 2017-12-15 15:30:47 +00:00
parent 8c811d52bf
commit 2012e67273
4 changed files with 26 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -15,7 +15,7 @@ has error_messages => sub {
sub post_index { sub post_index {
my $c = shift; my $c = shift;
my $user = $c->stash->{api_user}->entity; my $entity = $c->stash->{api_user}->entity;
my $duration = DateTime::Duration->new( weeks => 7 ); my $duration = DateTime::Duration->new( weeks => 7 );
my $end = DateTime->today; my $end = DateTime->today;
@ -26,7 +26,7 @@ sub post_index {
my $dtf = $c->schema->storage->datetime_parser; my $dtf = $c->schema->storage->datetime_parser;
my $driver = $c->schema->storage->dbh->{Driver}->{Name}; my $driver = $c->schema->storage->dbh->{Driver}->{Name};
my $transaction_rs = $c->schema->resultset('ViewQuantisedTransaction' . $driver)->search( my $week_transaction_rs = $c->schema->resultset('ViewQuantisedTransaction' . $driver)->search(
{ {
purchase_time => { purchase_time => {
-between => [ -between => [
@ -34,6 +34,7 @@ sub post_index {
$dtf->format_datetime($end), $dtf->format_datetime($end),
], ],
}, },
buyer_id => $entity->id,
}, },
{ {
columns => [ columns => [
@ -47,10 +48,27 @@ sub post_index {
} }
); );
for ( $transaction_rs->all ) { for ( $week_transaction_rs->all ) {
push @{ $weeks->{ purchases } }, ($_->get_column('count') || 0); push @{ $weeks->{ purchases } }, ($_->get_column('count') || 0);
} }
my $sector_purchase_rs = $entity->purchases->search({},
{
join => { 'seller' => 'organisation' },
columns => {
sector => "organisation.sector",
count => \"COUNT(*)",
},
group_by => "organisation.sector",
order_by => { '-desc' => "COUNT(*)" },
}
);
for ( $sector_purchase_rs->all ) {
push @{ $sectors->{ sectors } }, $_->get_column('sector');
push @{ $sectors->{ purchases } }, ($_->get_column('count') || 0);
}
return $c->render( json => { return $c->render( json => {
success => Mojo::JSON->true, success => Mojo::JSON->true,
weeks => $weeks, weeks => $weeks,

1
lib/Pear/LocalLoop/Controller/Api/V1/Customer/Graphs.pm
View file

@ -106,6 +106,7 @@ sub _purchases_avg_spend_duration {
$dtf->format_datetime($end), $dtf->format_datetime($end),
], ],
}, },
buyer_id => $entity->id,
}, },
{ {
columns => [ columns => [

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

@ -13,6 +13,8 @@ __PACKAGE__->result_source_instance->view_definition( qq/
SELECT "value", SELECT "value",
"distance", "distance",
"purchase_time", "purchase_time",
"buyer_id",
"seller_id",
DATE_TRUNC('hour', "purchase_time") AS "quantised_hours", DATE_TRUNC('hour', "purchase_time") AS "quantised_hours",
DATE_TRUNC('day', "purchase_time") AS "quantised_days", DATE_TRUNC('day', "purchase_time") AS "quantised_days",
DATE_TRUNC('week', "purchase_time") AS "quantised_weeks" DATE_TRUNC('week', "purchase_time") AS "quantised_weeks"

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

@ -13,6 +13,8 @@ __PACKAGE__->result_source_instance->view_definition( qq/
SELECT "value", SELECT "value",
"distance", "distance",
"purchase_time", "purchase_time",
"buyer_id",
"seller_id",
DATETIME(STRFTIME('%Y-%m-%d %H:00:00',"purchase_time")) AS "quantised_hours", 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")) 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 1')) AS "quantised_weeks"