add in send method code

4 files changed, 71 insertions, 22 deletions

diff --git a/bin/send-reports b/bin/send-reports
index 16f6bd8c0..7ccdf1dc4 100755
--- a/bin/send-reports
+++ b/bin/send-reports
@@ -30,6 +30,17 @@ use mySociety::Web qw(ent);
 
 use Open311;
 
+# specific council numbers
+use constant COUNCIL_ID_EAST_HANTS => 2330;
+
+use constant MAX_LINE_LENGTH       => 132;
+
+# send_method config values found in by-area config data, for selecting to appropriate method
+use constant SEND_METHOD_EMAIL      => 'email';
+use constant SEND_METHOD_OPEN311    => 'open311';
+use constant SEND_METHOD_EAST_HANTS => 'easthants';
+use constant SEND_METHOD_LONDON     => 'london';
+
 # Set up site, language etc.
 my ($verbose, $nomail) = CronFns::options();
 my $base_url = mySociety::Config::get('BASE_URL');
@@ -56,8 +67,10 @@ while (my $row = $unsent->next) {
         next;
     }
 
-    my $send_email = 0;
-    my $send_web = 0;
+    # Due to multiple councils, it's possible to want to send both by email *and* another method
+    # NB: might need to revist this if multiple councils have custom send methods
+    my $send_email = 0; 
+    my $send_method = 0;
 
     # Template variables for the email
     my $email_base_url = $cobrand->base_url_for_emails($row->cobrand_data);
@@ -118,6 +131,7 @@ while (my $row = $unsent->next) {
 
         push @to, [ $council_email, $name ];
         @recips = ($council_email);
+        $send_method = 0;
         $send_email = 1;
         $template = Utils::read_file("$FindBin::Bin/../templates/email/emptyhomes/" . $row->lang . "/submit.txt");
 
@@ -133,15 +147,37 @@ while (my $row = $unsent->next) {
         foreach my $council (@councils) {
             my $name = $areas_info->{$council}->{name};
             push @dear, $name;
-            if ($council == 2330) { # E. Hants have a web service
-                $send_web = 'easthants';
+
+            # look in the DB to determine if there is a special handler for this council (e.g., open311, or custom)
+            my $council_config = FixMyStreet::App->model("DB::Open311conf")->search( { area_id => $council} )->first;
+            $send_method = $council_config->send_method if $council_config;
+            if ($council == COUNCIL_ID_EAST_HANTS) { # E. Hants have a web service
+                $send_method = SEND_METHOD_EAST_HANTS; # TODO: delete? should be in the db
                 $h{category} = 'Customer Services' if $h{category} eq 'Other';
-            } elsif ( my $endpoint = FixMyStreet::App->model("DB::Open311conf")->search( { area_id => $council, endpoint => { '!=', '' } } )->first ) {
-                push @open311_councils, $endpoint;
-                $send_web = 'open311';
-            } elsif ($areas_info->{$council}->{type} eq 'LBO') { # London
-                $send_web = 'london';
-            } else {
+            } 
+
+            # if council lookup provided no explicit send_method, maybe there's some other criterion for setting it:
+            if (! $send_method) {
+                if ($areas_info->{$council}->{type} eq 'LBO') { # London
+                    $send_method = SEND_METHOD_LONDON;
+                }
+            }
+            $send_email = 1 unless $send_method; # default to email if nothing explicit was provided
+            
+            # currently: open311 without an endpoint is useless, so check the endpoint is set
+            if ($send_method eq SEND_METHOD_OPEN311) { 
+                if ($council_config->endpoint) {
+                    if ($send_method eq SEND_METHOD_OPEN311) {
+                        push @open311_councils, $council_config;                        
+                    }
+                } else {
+                    print "Warning: no endpoint specified in config data for council=$council (will try email instead)\n";
+                    $send_method = 0;
+                    $send_email = 1;
+                }
+            }
+            
+            if ($send_email) {
                 my $contact = FixMyStreet::App->model("DB::Contact")->find( {
                     deleted => 0,
                     area_id => $council,
@@ -160,7 +196,6 @@ while (my $row = $unsent->next) {
                 }
                 push @to, [ $council_email, $name ];
                 $recips{$council_email} = 1;
-                $send_email = 1;
             }
         }
         @recips = keys %recips;
@@ -199,15 +234,19 @@ while (my $row = $unsent->next) {
 
     }
 
-    unless ($send_email || $send_web) {
+    unless ($send_method) {
         die 'Report not going anywhere for ID ' . $row->id . '!';
     }
 
     if (mySociety::Config::get('STAGING_SITE')) {
         # on a staging server send emails to ourselves rather than the councils
-        @recips = ( mySociety::Config::get('CONTACT_EMAIL') );
-        $send_web = 0;
-        $send_email = 1;
+        # ...webservice calls will only go through if explictly allowed here:
+        my @testing_councils = ();
+        unless (grep {$row->council eq $_} @testing_councils) {
+            @recips = ( mySociety::Config::get('CONTACT_EMAIL') );
+            $send_method = 0;
+            $send_email = 1;
+        }
     } elsif ($site eq 'emptyhomes') {
         my $council = $row->council;
         my $country = $areas_info->{$council}->{country};
@@ -243,17 +282,17 @@ while (my $row = $unsent->next) {
         );
     }
 
-    if ($send_web eq 'easthants') {
+    if ($send_method eq SEND_METHOD_EAST_HANTS) {
         $h{message} = construct_easthants_message(%h);
         if (!$nomail) {
             $result *= post_easthants_message(%h);
         }
-    } elsif ($send_web eq 'london') {
+    } elsif ($send_method eq SEND_METHOD_LONDON) {
         $h{message} = construct_london_message(%h);
         if (!$nomail) {
             $result *= post_london_report( $row, %h );
         }
-    } elsif ($send_web eq 'open311') {
+    } elsif ($send_method eq SEND_METHOD_OPEN311) {
         foreach my $conf ( @open311_councils ) {
             print 'posting to end point for ' . $conf->area_id . "\n" if $verbose;
 
diff --git a/db/schema.sql b/db/schema.sql
index d54cecd5a..ab323ee1a 100644
--- a/db/schema.sql
+++ b/db/schema.sql
@@ -420,5 +420,6 @@ create table open311conf (
     area_id      integer not null unique,
     endpoint     text not null,
     jurisdiction text,
-    api_key      text
+    api_key      text,
+    send_method  text
 );
diff --git a/db/schema_0013-add_send_method_column_to_open311conf.sql b/db/schema_0013-add_send_method_column_to_open311conf.sql
new file mode 100644
index 000000000..516fdd698
--- /dev/null
+++ b/db/schema_0013-add_send_method_column_to_open311conf.sql
@@ -0,0 +1,7 @@
+
+begin;
+
+ALTER table open311conf
+    ADD column send_method TEXT;
+
+commit;
diff --git a/perllib/FixMyStreet/DB/Result/Open311conf.pm b/perllib/FixMyStreet/DB/Result/Open311conf.pm
index 0a5784560..742a12ebd 100644
--- a/perllib/FixMyStreet/DB/Result/Open311conf.pm
+++ b/perllib/FixMyStreet/DB/Result/Open311conf.pm
@@ -1,3 +1,4 @@
+use utf8;
 package FixMyStreet::DB::Result::Open311conf;
 
 # Created by DBIx::Class::Schema::Loader
@@ -7,7 +8,6 @@ use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
-
 __PACKAGE__->load_components("FilterColumn", "InflateColumn::DateTime", "EncodedColumn");
 __PACKAGE__->table("open311conf");
 __PACKAGE__->add_columns(
@@ -26,13 +26,15 @@ __PACKAGE__->add_columns(
   { data_type => "text", is_nullable => 1 },
   "api_key",
   { data_type => "text", is_nullable => 1 },
+  "send_method",
+  { data_type => "text", is_nullable => 1 },
 );
 __PACKAGE__->set_primary_key("id");
 __PACKAGE__->add_unique_constraint("open311conf_area_id_key", ["area_id"]);
 
 
-# Created by DBIx::Class::Schema::Loader v0.07010 @ 2011-07-29 18:09:25
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:ryqCpvwjNtQrZm4I3s0hxg
+# Created by DBIx::Class::Schema::Loader v0.07017 @ 2012-03-08 17:19:55
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:ClYnPB2gsKapnfHuco5d/w
 
 
 # You can replace this text with custom code or comments, and it will be preserved on regeneration