Merge branch 'rss-addresses'

Conflicts:
	db/schema.sql
	perllib/FixMyStreet/DB/Result/Problem.pm

3 files changed, 196 insertions, 1 deletions

diff --git a/t/app/controller/alert_new.t b/t/app/controller/alert_new.t
index 580a5ad9a..950666d2d 100644
--- a/t/app/controller/alert_new.t
+++ b/t/app/controller/alert_new.t
@@ -452,8 +452,9 @@ subtest "Test normal alert signups and that alerts are sent" => sub {
         $count++ if $_->body =~ /The following updates have been left on this problem:/;
         $count++ if $_->body =~ /The following new problems have been reported to City of\s*Edinburgh Council:/;
         $count++ if $_->body =~ /The following nearby problems have been added:/;
+        $count++ if $_->body =~ / - Testing, EH1 1BB/;
     }
-    is $count, 3, 'Three emails with the right things in them';
+    is $count, 5, 'Five emails with the right things in them';
 
     my $email = $emails[0];
     like $email->body, qr/Other User/, 'Update name given';
diff --git a/t/app/controller/rss.t b/t/app/controller/rss.t
new file mode 100644
index 000000000..c6ab20574
--- /dev/null
+++ b/t/app/controller/rss.t
@@ -0,0 +1,125 @@
+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->postcode('eh11bb');
+$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->postcode('Princes St, Edinburgh');
+$report->update();
+
+$mech->get_ok("/rss/pc/EH11BB/2");
+$mech->content_contains( "Testing, 10th October, Princes St, Edinburgh" );
+
+$report->delete();
+$user1->delete();
+
+done_testing();
diff --git a/t/app/model/alert_type.t b/t/app/model/alert_type.t
index c7bfe171c..e88aeea5f 100644
--- a/t/app/model/alert_type.t
+++ b/t/app/model/alert_type.t
@@ -140,5 +140,74 @@ for my $test (
     };
 }
 
+my $now = DateTime->now();
+$report->confirmed( $now->ymd . ' ' . $now->hms );
+$report->update();
+
+my $council_alert = FixMyStreet::App->model('DB::Alert')->find_or_create(
+    {
+        user => $user2,
+        parameter => 2504,
+        parameter2 => 2504,
+        alert_type => 'council_problems',
+        whensubscribed => $dt->ymd . ' ' . $dt->hms,
+        confirmed => 1,
+    }
+);
+
+for my $test (
+    {
+        postcode           => 'SW1A 1AA',
+        expected_postcode  => 'SW1A 1AA',
+    },
+    {
+        postcode           => 'sw1a 1AA',
+        expected_postcode  => 'SW1A 1AA',
+    },
+    {
+        postcode           => 'SW1A 1aa',
+        expected_postcode  => 'SW1A 1AA',
+    },
+    {
+        postcode           => 'SW1A1AA',
+        expected_postcode  => 'SW1A 1AA',
+    },  
+    {
+        postcode           => 'Buckingham Gate',
+        expected_postcode  => 'Buckingham Gate',
+    },  
+    {
+        postcode           => 'Buckingham gate',
+        expected_postcode  => 'Buckingham gate',
+    },  
+) {
+    subtest "correct text for postcode $test->{postcode}" => sub {
+        $mech->clear_emails_ok;
+
+        my $sent = FixMyStreet::App->model('DB::AlertSent')->search(
+            {
+                alert_id => $council_alert->id,
+                parameter => $report->id,
+            }
+        )->delete;
+
+        $report->postcode( $test->{postcode} );
+        $report->update;
+
+        FixMyStreet::App->model('DB::AlertType')->email_alerts();
+            
+        $mech->email_count_is( 1 );
+        my $email = $mech->get_email;
+        my $pc = $test->{expected_postcode};
+        my $title = $report->title;
+        my $body = $email->body;
+
+        like $body, qr#report/$report_id - $title, $pc#, 'email contains expected postcode';
+    };
+}
+
+$report->postcode( 'SW1A 1AA' );
+$report->update;
+
 done_testing();