include nearest road data in rss feed if available, plus tests

2 files changed, 120 insertions, 3 deletions

diff --git a/perllib/FixMyStreet/App/Controller/Rss.pm b/perllib/FixMyStreet/App/Controller/Rss.pm
index 8b98433bb..20c839208 100755
--- a/perllib/FixMyStreet/App/Controller/Rss.pm
+++ b/perllib/FixMyStreet/App/Controller/Rss.pm
@@ -270,9 +270,8 @@ sub add_row : Private {
     }
 
     if ( $row->{used_map} ) {
-        # TODO: uncomment these when the populate script has been run
-        # my $address = $c->cobrand->find_closest_address_for_rss( $row->{latitude}, $row->{longitude}, $row );
-        # $item{description} .= ent("\n<br>$address") if $address;
+        my $address = $c->cobrand->find_closest_address_for_rss( $row->{latitude}, $row->{longitude}, $row );
+        $item{description} .= ent("\n<br>$address") if $address;
     }
 
     my $recipient_name = $c->cobrand->contact_name;
diff --git a/t/app/controller/rss.t b/t/app/controller/rss.t
new file mode 100644
index 000000000..39a7db5bc
--- /dev/null
+++ b/t/app/controller/rss.t
@@ -0,0 +1,118 @@
+use strict;
+use warnings;
+use Test::More;
+
+use FixMyStreet::TestMech;
+
+my $mech = FixMyStreet::TestMech->new;
+
+my $dt = DateTime->new(
+    year => 2011,
+    month => 10,
+    day     => 10
+);
+
+my $user1 = FixMyStreet::App->model('DB::User')
+  ->find_or_create( { email => 'reporter@example.com', name => 'Reporter User' } );
+
+my $report = FixMyStreet::App->model('DB::Problem')->find_or_create( {
+    postcode           => 'EH1 1BB',
+    council            => '2651',
+    areas              => ',11808,135007,14419,134935,2651,20728,',
+    category           => 'Street lighting',
+    title              => 'Testing',
+    detail             => 'Testing Detail',
+    used_map           => 1,
+    name               => $user1->name,
+    anonymous          => 0,
+    state              => 'confirmed',
+    confirmed          => $dt,
+    lastupdate         => $dt,
+    whensent           => $dt->clone->add( minutes => 5 ),
+    lang               => 'en-gb',
+    service            => '',
+    cobrand            => 'default',
+    cobrand_data       => '',
+    send_questionnaire => 1,
+    latitude           => '55.951963',
+    longitude          => '-3.189944',
+    user_id            => $user1->id,
+} );
+
+
+$mech->get_ok("/rss/pc/EH11BB/2");
+$mech->content_contains( "Testing, 10th October, EH1 1BB" );
+$mech->content_lacks( 'Nearest road to the pin' );
+
+$report->geocode( 
+{
+          'traceId' => 'ae7c4880b70b423ebc8ab4d80961b3e9|LTSM001158|02.00.71.1600|LTSMSNVM002010, LTSMSNVM001477',
+          'statusDescription' => 'OK',
+          'brandLogoUri' => 'http://dev.virtualearth.net/Branding/logo_powered_by.png',
+          'resourceSets' => [
+                              {
+                                'resources' => [
+                                                 {
+                                                   'geocodePoints' => [
+                                                                        {
+                                                                          'calculationMethod' => 'Interpolation',
+                                                                          'coordinates' => [
+                                                                                             '55.9532357007265',
+                                                                                             '-3.18906001746655'
+                                                                                           ],
+                                                                          'usageTypes' => [
+                                                                                            'Display',
+                                                                                            'Route'
+                                                                                          ],
+                                                                          'type' => 'Point'
+                                                                        }
+                                                                      ],
+                                                   'entityType' => 'Address',
+                                                   'name' => '18 N Bridge, Edinburgh EH1 1',
+                                                   'point' => {
+                                                                'coordinates' => [
+                                                                                   '55.9532357007265',
+                                                                                   '-3.18906001746655'
+                                                                                 ],
+                                                                'type' => 'Point'
+                                                              },
+                                                   'bbox' => [
+                                                               '55.9493729831558',
+                                                               '-3.19825819222605',
+                                                               '55.9570984182972',
+                                                               '-3.17986184270704'
+                                                             ],
+                                                   'matchCodes' => [
+                                                                     'Good'
+                                                                   ],
+                                                   'address' => {
+                                                                  'countryRegion' => 'United Kingdom',
+                                                                  'adminDistrict2' => 'Edinburgh City',
+                                                                  'adminDistrict' => 'Scotland',
+                                                                  'addressLine' => '18 North Bridge',
+                                                                  'formattedAddress' => '18 N Bridge, Edinburgh EH1 1',
+                                                                  'postalCode' => 'EH1 1',
+                                                                  'locality' => 'Edinburgh'
+                                                                },
+                                                   'confidence' => 'Medium',
+                                                   '__type' => 'Location:http://schemas.microsoft.com/search/local/ws/rest/v1'
+                                                 }
+                                               ],
+                                'estimatedTotal' => 1
+                              }
+                            ],
+          'copyright' => "Copyright \x{a9} 2011 Microsoft and its suppliers. All rights reserved. This API cannot be accessed and the content and any results may not be used, reproduced or transmitted in any manner without express written permission from Microsoft Corporation.",
+          'statusCode' => 200,
+          'authenticationResultCode' => 'ValidCredentials'
+        }
+);
+$report->update();
+
+$mech->get_ok("/rss/pc/EH11BB/2");
+$mech->content_contains( "Testing, 10th October, EH1 1BB" );
+$mech->content_contains( '18 North Bridge, Edinburgh' );
+
+$report->delete();
+$user1->delete();
+
+done_testing();