1 files changed, 13 insertions, 13 deletions

diff --git a/bin/send-comments b/bin/send-comments
index d2b057996..4f654fe20 100755
--- a/bin/send-comments
+++ b/bin/send-comments
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 
 # send-comments:
-# Send comments/updates on reports to councils
+# Send comments/updates on reports to bodies
 #   In Open311 parlance these are 'service request udpates' and are sent using
 #   mySociety's proposed extension to the Open311 Georeport v2 spec:
 #   https://github.com/mysociety/fixmystreet/wiki/Open311-FMS---Proposed-differences-to-Open311
@@ -40,16 +40,16 @@ my ($verbose, $nomail) = CronFns::options();
 my $base_url = mySociety::Config::get('BASE_URL');
 my $site = CronFns::site($base_url);
 
-my $councils = FixMyStreet::App->model('DB::Open311Conf')->search( {
+my $bodies = FixMyStreet::App->model('DB::Body')->search( {
     send_method => SEND_METHOD_OPEN311,
     send_comments => 1,
 } );
 
-while ( my $council = $councils->next ) {
+while ( my $body = $bodies->next ) {
 
     # Oxfordshire (OCC) is special:
     # we do *receive* service_request_updates (aka comments) for OCC, but we never *send* them, so skip this pass
-    next if $council->area_id == COUNCIL_ID_OXFORDSHIRE;
+    next if $body->areas->{COUNCIL_ID_OXFORDSHIRE};
 
     my $use_extended = 0;
     my $comments = FixMyStreet::App->model('DB::Comment')->search( {
@@ -59,7 +59,7 @@ while ( my $council = $councils->next ) {
             'me.confirmed'      => { '!=' => undef },
             'problem.whensent'    => { '!=' => undef },
             'problem.external_id'  => { '!=' => undef },
-            'problem.council'      => { -like => '%' . $council->area_id .'%' },
+            'problem.bodies_str' => { -like => '%' . $body->id . '%' },
             'problem.send_method_used' => 'Open311',
         },
         {
@@ -67,25 +67,25 @@ while ( my $council = $councils->next ) {
         }
     );
 
-    if ( $council->area_id == 2482 ) {
+    if ( $body->areas->{2482} ) {
         $use_extended = 1;
     }
 
     my %open311_conf = (
-            endpoint => $council->endpoint,
-            jurisdiction => $council->jurisdiction,
-            api_key => $council->api_key,
+            endpoint => $body->endpoint,
+            jurisdiction => $body->jurisdiction,
+            api_key => $body->api_key,
             use_extended_updates => $use_extended,
     );
 
 
-    if ( $council->send_extended_statuses ) {
+    if ( $body->send_extended_statuses ) {
         $open311_conf{extended_statuses} = 1;
     }
 
     my $o = Open311->new( %open311_conf );
 
-    if ( $council->area_id =~ /2482/ ) {
+    if ( $body->areas->{2482} ) {
         my $endpoints = $o->endpoints;
         $endpoints->{update} = 'update.xml';
         $endpoints->{service_request_updates} = 'update.xml';
@@ -97,7 +97,7 @@ while ( my $council = $councils->next ) {
 
         # actually this should be OK for any devolved endpoint if original Open311->can_be_devolved, presumably
         if ( $cobrand->moniker eq "fixmybarangay") {
-            my $sender = $cobrand->get_council_sender( $council->area_id, undef, $comment->problem->category );
+            my $sender = $cobrand->get_body_sender( $body, $comment->problem->category );
             my $config = $sender->{config};
             $o = Open311->new(
                     endpoint => $config->endpoint,
@@ -111,7 +111,7 @@ while ( my $council = $councils->next ) {
             next if bromley_retry_timeout( $comment );
         }
 
-        if ( $council->area_id == 2482 ) {
+        if ( $body->areas->{2482} ) {
             my $extra = $comment->extra;
             if ( !$extra ) {
                 $extra = {};