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

Updated to allow for user updates to change location by postcode

Browse source
This commit is contained in:
Tom Bloor 2017-10-03 15:47:05 +01:00
parent 202deb9178
commit 37e8f0b46a
6 changed files with 105 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -4,6 +4,7 @@
* Location is now updated on registration. Customers location is truncated to 2
decimal places based on their postcode.
* Location is also updated on changing a users postcode
## Bug Fixes

1
lib/Pear/LocalLoop.pm
View file

@ -39,6 +39,7 @@ sub startup {
$self->plugin('Pear::LocalLoop::Plugin::BootstrapPagination', { bootstrap4 => 1 } );
$self->plugin('Pear::LocalLoop::Plugin::Validators');
$self->plugin('Pear::LocalLoop::Plugin::Datetime');
$self->plugin('Pear::LocalLoop::Plugin::Postcodes');
$self->plugin('Pear::LocalLoop::Plugin::TemplateHelpers');
$self->plugin('Authentication' => {

29
lib/Pear/LocalLoop/Controller/Api/Register.pm
View file

@ -82,34 +82,11 @@ sub post_register {
return $c->api_validation_error if $validation->has_error;
my $postcode_obj = Geo::UK::Postcode::Regex->parse(
$validation->param('postcode')
my $location = $c->get_location_from_postcode(
$validation->param('postcode'),
$usertype,
);
my $location;
unless ( defined $postcode_obj && $postcode_obj->{non_geographical} ) {
my $pc_result = $c->schema->resultset('GbPostcode')->find({
incode => $postcode_obj->{incode},
outcode => $postcode_obj->{outcode},
});
if ( defined $pc_result ) {
# Force truncation here as SQLite is stupid
$location = {
latitude => (
$usertype eq 'customer'
? int($pc_result->latitude * 100 ) / 100
: $pc_result->latitude
),
longitude => (
$usertype eq 'customer'
? int($pc_result->longitude * 100 ) / 100
: $pc_result->longitude
),
};
}
}
if ($usertype eq 'customer'){
$c->schema->txn_do( sub {

7
lib/Pear/LocalLoop/Controller/Api/User.pm
View file

@ -145,6 +145,11 @@ sub post_account_update {
return $c->api_validation_error if $validation->has_error;
my $location = $c->get_location_from_postcode(
$validation->param('postcode'),
$user->type,
);
if ( $user->type eq 'customer' ){
$c->schema->txn_do( sub {
@ -152,6 +157,7 @@ sub post_account_update {
full_name => $validation->param('full_name'),
display_name => $validation->param('display_name'),
postcode => $validation->param('postcode'),
( defined $location ? ( %$location ) : ( latitude => undef, longitude => undef ) ),
});
$user->update({
email => $validation->param('email'),
@ -169,6 +175,7 @@ sub post_account_update {
town => $validation->param('town'),
sector => $validation->param('sector'),
postcode => $validation->param('postcode'),
( defined $location ? ( %$location ) : ( latitude => undef, longitude => undef ) ),
});
$user->update({
email => $validation->param('email'),

40
lib/Pear/LocalLoop/Plugin/Postcodes.pm Normal file
View file

@ -0,0 +1,40 @@
package Pear::LocalLoop::Plugin::Postcodes;
use Mojo::Base 'Mojolicious::Plugin';
use DateTime::Format::Strptime;
sub register {
my ( $plugin, $app, $conf ) = @_;
$app->helper( get_location_from_postcode => sub {
my ( $c, $postcode, $usertype ) = @_;
my $postcode_obj = Geo::UK::Postcode::Regex->parse( $postcode );
my $location;
unless ( defined $postcode_obj && $postcode_obj->{non_geographical} ) {
my $pc_result = $c->schema->resultset('GbPostcode')->find({
incode => $postcode_obj->{incode},
outcode => $postcode_obj->{outcode},
});
if ( defined $pc_result ) {
# Force truncation here as SQLite is stupid
$location = {
latitude => (
$usertype eq 'customer'
? int($pc_result->latitude * 100 ) / 100
: $pc_result->latitude
),
longitude => (
$usertype eq 'customer'
? int($pc_result->longitude * 100 ) / 100
: $pc_result->longitude
),
};
}
}
return $location;
});
}
1;

53
t/api/user/postcode.t Normal file
View file

@ -0,0 +1,53 @@
use Mojo::Base -strict;
use FindBin qw/ $Bin /;
use Test::More;
use Mojo::JSON;
use Test::Pear::LocalLoop;
my $framework = Test::Pear::LocalLoop->new(
etc_dir => "$Bin/../../etc",
);
$framework->install_fixtures('full');
my $t = $framework->framework;
my $schema = $t->app->schema;
my $session_key = $framework->login({
email => 'test1@example.com',
password => 'abc123',
});
$t->post_ok('/api/user', json => { session_key => $session_key })
->status_is(200)
->json_is('/success', Mojo::JSON->true)
->json_is('/postcode', 'LA1 1AA')
->json_is('/location', {
latitude => 54.04,
longitude => -2.80,
}
);
$t->post_ok('/api/user/account', json => {
session_key => $session_key,
full_name => 'Test User1',
display_name => 'Testing User1',
email => 'test1@example.com',
postcode => 'LA2 0AR',
password => 'abc123',
})
->status_is(200)->or($framework->dump_error)
->json_is('/success', Mojo::JSON->true);
$t->post_ok('/api/user', json => { session_key => $session_key })
->status_is(200)
->json_is('/success', Mojo::JSON->true)
->json_is('/postcode', 'LA2 0AR')
->json_is('/location', {
latitude => 53.99,
longitude => -2.84,
}
);
done_testing;