Merge remote branch 'origin/zurich'

Conflicts:
	bin/open311-populate-service-list
	bin/send-comments
	bin/update-all-reports
	conf/crontab.ugly
	db/schema.sql
	perllib/FixMyStreet/App/Controller/Admin.pm
	perllib/FixMyStreet/App/Controller/Report/New.pm
	perllib/FixMyStreet/App/Controller/Reports.pm
	perllib/FixMyStreet/Cobrand/Default.pm
	perllib/FixMyStreet/Cobrand/LichfieldDC.pm
	perllib/FixMyStreet/DB/Result/Open311conf.pm
	perllib/FixMyStreet/DB/Result/Problem.pm
	perllib/FixMyStreet/DB/ResultSet/Problem.pm
	perllib/FixMyStreet/SendReport.pm
	perllib/FixMyStreet/SendReport/Email.pm
	perllib/FixMyStreet/SendReport/Open311.pm
	perllib/Open311/GetServiceRequestUpdates.pm
	perllib/Open311/PopulateServiceList.pm
	t/app/controller/report_new.t
	t/app/controller/rss.t
	templates/web/bromley/report/display.html
	templates/web/default/admin/council_contacts.html
	templates/web/default/common_header_tags.html
	templates/web/default/dashboard/index.html
	templates/web/default/front/stats.html
	templates/web/default/report/_main.html
	templates/web/default/report/update-form.html
	templates/web/emptyhomes/index.html
	templates/web/emptyhomes/report/display.html
	templates/web/emptyhomes/report/new/councils_text_all.html
	templates/web/emptyhomes/reports/body.html
	templates/web/emptyhomes/reports/index.html
	templates/web/fixmystreet/report/new/fill_in_details_form.html
	templates/web/fixmystreet/report/update-form.html
	web/cobrands/fixmystreet/fixmystreet.js
	web/js/fixmystreet.js

1 files changed, 0 insertions, 82 deletions

diff --git a/perllib/Open311/GetUpdates.pm b/perllib/Open311/GetUpdates.pm
deleted file mode 100644
index 5d5291d47..000000000
--- a/perllib/Open311/GetUpdates.pm
+++ /dev/null
@@ -1,82 +0,0 @@
-package Open311::GetUpdates;
-
-use Moose;
-use Open311;
-use FixMyStreet::App;
-
-has council_list => ( is => 'ro' );
-has system_user => ( is => 'ro' );
-
-sub get_updates {
-    my $self = shift;
-
-    while ( my $council = $self->council_list->next ) {
-        my $open311 = Open311->new(
-            endpoint     => $council->endpoint,
-            jurisdiction => $council->jurisdiction,
-            api_key      => $council->api_key
-        );
-
-        my $area_id = $council->area_id;
-
-        my $council_details = mySociety::MaPit::call( 'area', $area_id );
-
-        my $reports = FixMyStreet::App->model('DB::Problem')->search(
-            {
-                council => { like => "\%$area_id\%" },
-                state => { 'IN', [qw/confirmed fixed/] },
-                -and => [
-                    external_id => { '!=', undef },
-                    external_id => { '!=', '' },
-                ],
-            }
-        );
-
-        my @report_ids = ();
-        while ( my $report = $reports->next ) {
-            push @report_ids, $report->external_id;
-        }
-
-        next unless @report_ids;
-
-        $self->update_reports( \@report_ids, $open311, $council_details );
-    }
-}
-
-sub update_reports {
-    my ( $self, $report_ids, $open311, $council_details ) = @_;
-
-    my $service_requests = $open311->get_service_requests( $report_ids );
-
-    my $requests;
-
-    # XML::Simple is a bit inconsistent in how it structures
-    # things depending on the number of children an element has :(
-    if ( ref $service_requests->{request} eq 'ARRAY' ) {
-        $requests = $service_requests->{request};
-    }
-    else {
-        $requests = [ $service_requests->{request} ];
-    }
-
-    for my $request (@$requests) {
-        # if it's a ref that means it's an empty element
-        # however, if there's no updated date then we can't
-        # tell if it's newer that what we have so we should skip it
-        next if ref $request->{updated_datetime} || ! exists $request->{updated_datetime};
-
-        my $request_id = $request->{service_request_id};
-
-        my $problem =
-          FixMyStreet::App->model('DB::Problem')
-          ->search( { external_id => $request_id, } );
-
-        if (my $p = $problem->first) {
-            $p->update_from_open311_service_request( $request, $council_details, $self->system_user );
-        }
-    }
-
-    return 1;
-}
-
-1;