[SeeSomething] Remove cobrand.

3 files changed, 2 insertions, 144 deletions

diff --git a/perllib/FixMyStreet/App/Controller/Admin.pm b/perllib/FixMyStreet/App/Controller/Admin.pm
index 87a4191af..d37e0b39c 100644
--- a/perllib/FixMyStreet/App/Controller/Admin.pm
+++ b/perllib/FixMyStreet/App/Controller/Admin.pm
@@ -1484,7 +1484,7 @@ sub stats : Path('stats') : Args(0) {
         $selected_body = $c->user->from_body->id;
     }
 
-    if ( $c->cobrand->moniker eq 'seesomething' || $c->cobrand->moniker eq 'zurich' ) {
+    if ( $c->cobrand->moniker eq 'zurich' ) {
         return $c->cobrand->admin_stats();
     }
 
diff --git a/perllib/FixMyStreet/Cobrand/SeeSomething.pm b/perllib/FixMyStreet/Cobrand/SeeSomething.pm
deleted file mode 100644
index 4d4dd000e..000000000
--- a/perllib/FixMyStreet/Cobrand/SeeSomething.pm
+++ /dev/null
@@ -1,135 +0,0 @@
-package FixMyStreet::Cobrand::SeeSomething;
-use parent 'FixMyStreet::Cobrand::UKCouncils';
-
-use strict;
-use warnings;
-
-sub council_id { return [ 2520, 2522, 2514, 2546, 2519, 2538, 2535 ]; }
-sub council_area { return 'West Midlands'; }
-sub council_name { return 'See Something Say Something'; }
-sub council_url { return 'seesomething'; }
-sub area_types  { [ 'MTD' ] }
-
-sub area_check {
-    my ( $self, $params, $context ) = @_;
-
-    my $councils = $params->{all_areas};
-    my $council_match = grep { $councils->{$_} } @{ $self->council_id };
-
-    if ($council_match) {
-        return 1;
-    }
-
-    return ( 0, "That location is not covered by See Something, Say Something" );
-}
-
-sub disambiguate_location {
-    my $self    = shift;
-    my $string  = shift;
-
-    my $town = 'West Midlands';
-
-    return {
-        %{ $self->SUPER::disambiguate_location() },
-        town => $town,
-        centre => '52.4803101685267,-2.2708272758854',
-        span   => '1.4002794815887,2.06340043925997',
-        bounds => [ 51.8259444771676, -3.23554082684068, 53.2262239587563, -1.17214038758071 ],
-    };
-}
-
-sub example_places {
-    return ( 'WS1 4NH', 'Austin Drive, Coventry' );
-}
-
-sub send_questionnaires {
-    return 0;
-}
-
-sub ask_ever_reported {
-    return 0;
-}
-
-sub report_sent_confirmation_email { 1; }
-
-sub report_check_for_errors { return (); }
-
-sub never_confirm_reports { 1; }
-
-sub allow_anonymous_reports { 1; }
-
-sub anonymous_account { return { name => 'Anonymous Submission', email => FixMyStreet->config('DO_NOT_REPLY_EMAIL') }; }
-
-sub admin_allow_user {
-    my ( $self, $user ) = @_;
-    return 1 if ( $user->from_body || $user->is_superuser );
-}
-
-sub admin_pages {
-    my $self = shift;
-
-    return {
-        'stats' => ['Reports', 0],
-    };
-};
-
-sub admin_stats {
-    my $self = shift;
-    my $c = $self->{c};
-
-    my %filters = ();
-
-    # XXX The below lookup assumes a body ID === MapIt area ID
-    my %councils =
-        map {
-            my $name = $_->name;
-            $name =~ s/(?:Borough|City) Council//;
-            ($_->id => $name);
-        }
-        $c->model('DB::Body')->search({ id => $self->council_id });
-
-    $c->stash->{council_details} = \%councils;
-
-    if ( !$c->user_exists || !grep { $_ == $c->user->from_body->id } @{ $self->council_id } ) {
-        $c->detach( '/page_error_404_not_found' );
-    }
-
-    if ( $c->get_param('category') ) {
-        $filters{category} = $c->get_param('category');
-        $c->stash->{category} = $c->get_param('category');
-    }
-
-    if ( $c->get_param('subcategory') ) {
-        $filters{subcategory} = $c->get_param('subcategory');
-        $c->stash->{subcategory} = $c->get_param('subcategory');
-    }
-
-    if ( $c->get_param('service') ) {
-        $filters{service} = { -ilike => $c->get_param('service') };
-        $c->stash->{service} = $c->get_param('service');
-    }
-
-    my $page = $c->get_param('p') || 1;
-
-    my $p = $c->model('DB::Problem')->search(
-        {
-            confirmed => { not => undef },
-            %filters
-        },
-        {
-            columns => [ qw(
-                service category subcategory confirmed bodies_str
-            ) ],
-            order_by => { -desc=> [ 'confirmed' ] },
-            rows => 20,
-        }
-    )->page( $page );
-
-    $c->stash->{reports} = $p;
-    $c->stash->{pager} = $p->pager;
-
-    return 1;
-}
-
-1;
-
diff --git a/perllib/FixMyStreet/SendReport/Email.pm b/perllib/FixMyStreet/SendReport/Email.pm
index 9abccf510..28f3411d0 100644
--- a/perllib/FixMyStreet/SendReport/Email.pm
+++ b/perllib/FixMyStreet/SendReport/Email.pm
@@ -29,13 +29,6 @@ sub build_recipient_list {
             $self->unconfirmed_notes->{$body_email}{$row->category} = $note;
         }
 
-        my $body_name = $body->name;
-        # see something uses council areas but doesn't send to councils so just use a
-        # generic name here to minimise confusion
-        if ( $row->cobrand eq 'seesomething' ) {
-            $body_name = 'See Something, Say Something';
-        }
-
         my @emails;
         # allow multiple emails per contact
         if ( $body_email =~ /,/ ) {
@@ -44,7 +37,7 @@ sub build_recipient_list {
             @emails = ( $body_email );
         }
         for my $email ( @emails ) {
-            push @{ $self->to }, [ $email, $body_name ];
+            push @{ $self->to }, [ $email, $body->name ];
         }
     }