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

This should have fixed a few issues... need to speed things up though

Browse source
This commit is contained in:
Tom Bloor 2019-07-15 04:25:51 +01:00
parent 4fdff21f50
commit b02f8b7c5f
No known key found for this signature in database
GPG key ID: 4657C7EBE42CC5CC
1 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
lib/Pear/LocalLoop/Controller/Api/External.pm
View file

@ -123,7 +123,12 @@ sub post_year_spend {
my $user = $c->stash->{api_user}; my $user = $c->stash->{api_user};
my $last = DateTime->today; # Temporary date lock for dev data
my $last = DateTime->new(
year => 2019,
month => 4,
day => 1
);
my $first = $last->clone->subtract( years => 1 ); my $first = $last->clone->subtract( years => 1 );
my $dtf = $c->schema->storage->datetime_parser; my $dtf = $c->schema->storage->datetime_parser;
@ -170,7 +175,12 @@ sub post_supplier_count {
my $user = $c->stash->{api_user}; my $user = $c->stash->{api_user};
my $last = DateTime->today; # Temporary date lock for dev data
my $last = DateTime->new(
year => 2019,
month => 4,
day => 1
);
my $first = $last->clone->subtract( years => 1 ); my $first = $last->clone->subtract( years => 1 );
my $dtf = $c->schema->storage->datetime_parser; my $dtf = $c->schema->storage->datetime_parser;
@ -187,6 +197,7 @@ sub post_supplier_count {
}, },
{ {
columns => [ columns => [
'seller_id',
{ {
quantised => 'quantised_days', quantised => 'quantised_days',
count => \"COUNT(*)", count => \"COUNT(*)",
@ -203,17 +214,13 @@ sub post_supplier_count {
'me.buyer_id' => $user->entity->id, 'me.buyer_id' => $user->entity->id,
}, },
{ {
prefetch => { entity => 'organisation' }, join => { seller => 'organisation' },
columns => [
'organisation.name',
'entity.id'
]
} }
); );
my %name_map = ( my %name_map = (
map { map {
$_->entity->id => $_->entity->organisation->name, $_->seller->id => $_->seller->organisation->name,
} $name_rs->all } $name_rs->all
); );
@ -222,7 +229,7 @@ sub post_supplier_count {
count => $_->get_column('count'), count => $_->get_column('count'),
value => $_->get_column('total_spend'), value => $_->get_column('total_spend'),
date => $_->get_column('quantised'), date => $_->get_column('quantised'),
seller => %name_map{ $_->get_column('seller_id') }, seller => $name_map{ $_->get_column('seller_id') },
} } $spend_rs->all, } } $spend_rs->all,
); );