Allow bodies to span multiple area IDs, and areas can be covered by more than one body.

4 files changed, 18 insertions, 17 deletions

diff --git a/t/app/controller/admin.t b/t/app/controller/admin.t
index d759c1238..d8b721ca9 100644
--- a/t/app/controller/admin.t
+++ b/t/app/controller/admin.t
@@ -259,7 +259,7 @@ subtest 'check open311 configuring' => sub {
     $mech->content_contains('Configuration updated - contacts will be generated automatically later');
 
     my $open311 =
-      FixMyStreet::App->model('DB::Body')->search( { area_id => 2650 } );
+      FixMyStreet::App->model('DB::Body')->search( { 'body_areas.area_id' => 2650 }, { join => 'body_areas' } );
 
     is $open311->count, 1, 'only one configuration';
     my $conf = $open311->first;
@@ -283,7 +283,7 @@ subtest 'check open311 configuring' => sub {
     $mech->content_contains('Configuration updated');
 
     $open311 =
-      FixMyStreet::App->model('DB::Body')->search( { area_id => 2650 } );
+      FixMyStreet::App->model('DB::Body')->search( { 'body_areas.area_id' => 2650 }, { join => 'body_areas' } );
 
     is $open311->count, 1, 'only one configuration';
     $conf = $open311->first;
diff --git a/t/app/controller/report_new_open311.t b/t/app/controller/report_new_open311.t
index e9ada9f41..22d2d1f97 100644
--- a/t/app/controller/report_new_open311.t
+++ b/t/app/controller/report_new_open311.t
@@ -7,12 +7,12 @@ use Web::Scraper;
 
 my $mech = FixMyStreet::TestMech->new;
 
-FixMyStreet::App->model('DB::Body')->find_or_create( {
-        area_id => 2651,
-        endpoint => 'http://example.com/open311',
-        jurisdiction => 'mySociety',
-        api_key => 'apikey',
-} );
+my $body = $mech->create_body_ok(2651, 'City of Edinburgh Council');
+$body->update({
+    endpoint => 'http://example.com/open311',
+    jurisdiction => 'mySociety',
+    api_key => 'apikey',
+});
 
 my %contact_params = (
     confirmed => 1,
diff --git a/t/app/model/problem.t b/t/app/model/problem.t
index ec82a3a4e..b2243fcf5 100644
--- a/t/app/model/problem.t
+++ b/t/app/model/problem.t
@@ -357,14 +357,14 @@ my %contact_params = (
 );
 
 for my $body (
-    { id => 2651, area_id => 2651, name => 'City of Edinburgh Council' },
-    { id => 2226, area_id => 2226, name => 'Gloucestershire County Council' },
-    { id => 2326, area_id => 2326, name => 'Cheltenham Borough Council' },
-    { id => 2434, area_id => 2434, name => 'Lichfield District Council' },
-    { id => 2240, area_id => 2240, name => 'Staffordshire County Council' },
-    { id => 14279, area_id => 14279, name => 'Ballymoney Borough Council' },
-    { id => 2636, area_id => 2636, name => 'Isle of Wight Council' },
-    { id => 2649, area_id => 2649, name => 'Fife Council' },
+    { id => 2651, name => 'City of Edinburgh Council' },
+    { id => 2226, name => 'Gloucestershire County Council' },
+    { id => 2326, name => 'Cheltenham Borough Council' },
+    { id => 2434, name => 'Lichfield District Council' },
+    { id => 2240, name => 'Staffordshire County Council' },
+    { id => 14279, name => 'Ballymoney Borough Council' },
+    { id => 2636, name => 'Isle of Wight Council' },
+    { id => 2649, name => 'Fife Council' },
 ) {
     $mech->create_body_ok($body->{id}, $body->{name});
 }
diff --git a/t/app/sendreport/email.t b/t/app/sendreport/email.t
index 17abd6243..106a31c42 100644
--- a/t/app/sendreport/email.t
+++ b/t/app/sendreport/email.t
@@ -14,7 +14,8 @@ use mySociety::Locale;
 
 my $e = FixMyStreet::SendReport::Email->new();
 
-my $params = { id => 1000, area_id => 1000, name => 'Council of the Thousand' };
+# area id 1000
+my $params = { id => 1000, name => 'Council of the Thousand' };
 my $body = FixMyStreet::App->model('DB::Body')->find_or_create($params);
 ok $body, "found/created body";