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

Change leaderboards to only follow customers

Browse source
This commit is contained in:
Tom Bloor 2017-06-05 22:59:31 +01:00
parent 5e06f0a69b
commit daeeac811c
3 changed files with 20 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

37
lib/Pear/LocalLoop/Schema/Result/Leaderboard.pm
View file

@ -51,7 +51,7 @@ sub create_new {
} elsif ( $type eq 'monthly_total' ) {
return $self->_create_total_set( $start, $start->clone->add( months => 1 ) );
} elsif ( $type eq 'all_time_total' ) {
return $self->_create_total_all_time;
return $self->_create_total_all_time( $start );
} elsif ( $type eq 'daily_count' ) {
return $self->_create_count_set( $start, $start->clone->add( days => 1 ) );
} elsif ( $type eq 'weekly_count' ) {
@ -59,18 +59,23 @@ sub create_new {
} elsif ( $type eq 'monthly_count' ) {
return $self->_create_count_set( $start, $start->clone->add( months => 1 ) );
} elsif ( $type eq 'all_time_count' ) {
return $self->_create_count_all_time;
return $self->_create_count_all_time( $start );
}
warn "Unrecognised type";
return $self;
}
sub _get_customer_rs {
my $self = shift;
return $self->result_source->schema->resultset('User')->search({
organisation_id => undef,
});
}
sub _create_total_set {
my ( $self, $start, $end ) = @_;
my $schema = $self->result_source->schema;
my $user_rs = $schema->resultset('User');
my $user_rs = $self->_get_customer_rs;
my @leaderboard;
@ -99,9 +104,7 @@ sub _create_total_set {
sub _create_count_set {
my ( $self, $start, $end ) = @_;
my $schema = $self->result_source->schema;
my $user_rs = $schema->resultset('User');
my $user_rs = $self->_get_customer_rs;
my @leaderboard;
@ -128,14 +131,10 @@ sub _create_count_set {
}
sub _create_total_all_time {
my ( $self ) = @_;
my $schema = $self->result_source->schema;
my $user_rs = $schema->resultset('User');
my $end = DateTime->today;
my ( $self, $end ) = @_;
my $user_rs = $self->_get_customer_rs;
my @leaderboard;
while ( my $user_result = $user_rs->next ) {
@ -161,13 +160,9 @@ sub _create_total_all_time {
}
sub _create_count_all_time {
my ( $self ) = @_;
my ( $self, $end ) = @_;
my $schema = $self->result_source->schema;
my $user_rs = $schema->resultset('User');
my $end = DateTime->today;
my $user_rs = $self->_get_customer_rs;
my @leaderboard;