Reduce use of FixMyStreet::App.

Command line scripts don't need a full blown app, just database.

4 files changed, 44 insertions, 43 deletions

diff --git a/t/open311/endpoint/warwick.t b/t/open311/endpoint/warwick.t
index b51c601f3..5c47cd529 100644
--- a/t/open311/endpoint/warwick.t
+++ b/t/open311/endpoint/warwick.t
@@ -7,7 +7,7 @@ use Test::MockTime ':all';
 use Data::Dumper;
 use JSON;
 
-use FixMyStreet::App;
+use FixMyStreet::DB;
 
 use Module::Loaded;
 BEGIN { mark_as_loaded('DBD::Oracle') }
@@ -141,16 +141,16 @@ subtest "End to end" => sub {
 
     my $WARWICKSHIRE_MAPIT_ID = 2243;
 
-    my $db = FixMyStreet::App->model('DB')->schema;
+    my $db = FixMyStreet::DB->connect;
 
     $db->txn_begin;
 
-    my $body = FixMyStreet::App->model('DB::Body')->find_or_create( {
+    my $body = FixMyStreet::DB->resultset('Body')->find_or_create( {
         id => $WARWICKSHIRE_MAPIT_ID,
         name => 'Warwickshire County Council',
     });
 
-    my $user = FixMyStreet::App->model('DB::User')
+    my $user = FixMyStreet::DB->resultset('User')
         ->find_or_create( { email => 'test@example.com', name => 'Test User' } );
 
     $body->update({
@@ -175,7 +175,7 @@ subtest "End to end" => sub {
 
         my $bodies = self_rs($body);
 
-        my $p = Open311::PopulateServiceList->new( bodies => $bodies, verbose => 0 );
+        my $p = Open311::PopulateServiceList->new( bodies => $bodies, verbose => 0, schema => $db );
         $p->process_bodies;
 
         is $body->contacts->count, 1, 'Categories imported from Open311';
@@ -183,7 +183,7 @@ subtest "End to end" => sub {
 
     set_fixed_time('2014-07-20T15:05:00Z');
 
-    my $problem = FixMyStreet::App->model('DB::Problem')->create({
+    my $problem = FixMyStreet::DB->resultset('Problem')->create({
         postcode           => 'WC1 1AA',
         bodies_str         => $WARWICKSHIRE_MAPIT_ID,
         areas              => ",$WARWICKSHIRE_MAPIT_ID,",
@@ -219,7 +219,7 @@ subtest "End to end" => sub {
             # self_rs($problem)->send_reports;
 
             ## instead, as we are in a transaction, we'll just delete everything else.
-            my $rs = FixMyStreet::App->model('DB::Problem');
+            my $rs = FixMyStreet::DB->resultset('Problem');
             $rs->search({ id => { '!=', $problem->id } })->delete;
             $rs->send_reports;
         };
@@ -242,7 +242,7 @@ subtest "End to end" => sub {
         is $problem->state, 'confirmed', 'sanity check status';
 
 
-        my $updates = Open311::GetServiceRequestUpdates->new( verbose => 1 );
+        my $updates = Open311::GetServiceRequestUpdates->new( verbose => 1, schema => $db );
         $updates->fetch;
 
         $problem->discard_changes;
diff --git a/t/open311/getservicerequestupdates.t b/t/open311/getservicerequestupdates.t
index 0ab5b232d..46c3feda4 100644
--- a/t/open311/getservicerequestupdates.t
+++ b/t/open311/getservicerequestupdates.t
@@ -10,17 +10,17 @@ use_ok( 'Open311' );
 use_ok( 'Open311::GetServiceRequestUpdates' );
 use DateTime;
 use DateTime::Format::W3CDTF;
-use FixMyStreet::App;
+use FixMyStreet::DB;
 
-my $user = FixMyStreet::App->model('DB::User')->find_or_create(
+my $user = FixMyStreet::DB->resultset('User')->find_or_create(
     {
         email => 'system_user@example.com'
     }
 );
 
 my %bodies = (
-    2482 => FixMyStreet::App->model("DB::Body")->new({ id => 2482 }),
-    2651 => FixMyStreet::App->model("DB::Body")->new({ id => 2651 }),
+    2482 => FixMyStreet::DB->resultset("Body")->new({ id => 2482 }),
+    2651 => FixMyStreet::DB->resultset("Body")->new({ id => 2651 }),
 );
 
 my $requests_xml = qq{<?xml version="1.0" encoding="utf-8"?>
@@ -104,7 +104,7 @@ subtest 'check extended request parsed correctly' => sub {
 
 };
 
-my $problem_rs = FixMyStreet::App->model('DB::Problem');
+my $problem_rs = FixMyStreet::DB->resultset('Problem');
 my $problem = $problem_rs->new(
     {
         postcode     => 'EH99 1SP',
@@ -353,7 +353,7 @@ for my $test (
         is $problem->comments->count, 1, 'comment count';
         $problem->discard_changes;
 
-        my $c = FixMyStreet::App->model('DB::Comment')->search( { external_id => $test->{external_id} } )->first;
+        my $c = FixMyStreet::DB->resultset('Comment')->search( { external_id => $test->{external_id} } )->first;
         ok $c, 'comment exists';
         is $c->text, $test->{description}, 'text correct';
         is $c->mark_fixed, $test->{mark_fixed}, 'mark_closed correct';
@@ -527,7 +527,7 @@ subtest 'check that existing comments are not duplicated' => sub {
 
     $problem->comments->delete;
 
-    my $comment = FixMyStreet::App->model('DB::Comment')->new(
+    my $comment = FixMyStreet::DB->resultset('Comment')->new(
         {
             problem => $problem,
             external_id => 638344,
@@ -660,7 +660,7 @@ foreach my $test ( {
         $problem->update;
 
         my @alerts = map {
-            my $alert = FixMyStreet::App->model('DB::Alert')->create( {
+            my $alert = FixMyStreet::DB->resultset('Alert')->create( {
                 alert_type => 'new_updates',
                 parameter  => $problem->id,
                 confirmed  => 1,
@@ -680,7 +680,7 @@ foreach my $test ( {
         $update->update_comments( $o, $bodies{2482} );
         $problem->discard_changes;
 
-        my $alerts_sent = FixMyStreet::App->model('DB::AlertSent')->search(
+        my $alerts_sent = FixMyStreet::DB->resultset('AlertSent')->search(
             {
                 alert_id => [ map $_->id, @alerts ],
                 parameter => $problem->comments->first->id,
diff --git a/t/open311/getupdates.t b/t/open311/getupdates.t
index 7dc7ff164..fef51e0e1 100644
--- a/t/open311/getupdates.t
+++ b/t/open311/getupdates.t
@@ -5,17 +5,18 @@ use warnings;
 use Test::More;
 
 use FixMyStreet;
+use FixMyStreet::DB;
 
 use_ok( 'Open311::GetUpdates' );
 use_ok( 'Open311' );
 
-my $user = FixMyStreet::App->model('DB::User')->find_or_create(
+my $user = FixMyStreet::DB->resultset('User')->find_or_create(
     {
         email => 'system_user@example.com'
     }
 );
 
-my $body = FixMyStreet::App->model('DB::Body')->new( {
+my $body = FixMyStreet::DB->resultset('Body')->new( {
     name => 'Test Body',
 } );
 
@@ -42,7 +43,7 @@ UPDATED_DATETIME
 </service_requests>
 };
 
-my $problem_rs = FixMyStreet::App->model('DB::Problem');
+my $problem_rs = FixMyStreet::DB->resultset('Problem');
 my $problem = $problem_rs->new(
     {
         postcode     => 'EH99 1SP',
diff --git a/t/open311/populate-service-list.t b/t/open311/populate-service-list.t
index 1574732fb..f001926d2 100644
--- a/t/open311/populate-service-list.t
+++ b/t/open311/populate-service-list.t
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 use Test::More;
 
-use FixMyStreet::App;
+use FixMyStreet::DB;
 
 use_ok( 'Open311::PopulateServiceList' );
 use_ok( 'Open311' );
@@ -13,7 +13,7 @@ use_ok( 'Open311' );
 my $processor = Open311::PopulateServiceList->new();
 ok $processor, 'created object';
 
-my $body = FixMyStreet::App->model('DB::Body')->find_or_create( {
+my $body = FixMyStreet::DB->resultset('Body')->find_or_create( {
     id => 1,
     name => 'Body Numero Uno',
 } );
@@ -22,7 +22,7 @@ $body->body_areas->find_or_create({
 } );
 
 my $BROMLEY = 'Bromley Council';
-my $bromley = FixMyStreet::App->model('DB::Body')->find_or_create( {
+my $bromley = FixMyStreet::DB->resultset('Body')->find_or_create( {
     id => 2482,
     name => $BROMLEY,
 } );
@@ -32,7 +32,7 @@ $bromley->body_areas->find_or_create({
 } );
 
 subtest 'check basic functionality' => sub {
-    FixMyStreet::App->model('DB::Contact')->search( { body_id => 1 } )->delete();
+    FixMyStreet::DB->resultset('Contact')->search( { body_id => 1 } )->delete();
 
     my $service_list = get_xml_simple_object( get_standard_xml() );
 
@@ -40,14 +40,14 @@ subtest 'check basic functionality' => sub {
     $processor->_current_body( $body );
     $processor->process_services( $service_list );
 
-    my $contact_count = FixMyStreet::App->model('DB::Contact')->search( { body_id => 1 } )->count();
+    my $contact_count = FixMyStreet::DB->resultset('Contact')->search( { body_id => 1 } )->count();
     is $contact_count, 3, 'correct number of contacts';
 };
 
 subtest 'check non open311 contacts marked as deleted' => sub {
-    FixMyStreet::App->model('DB::Contact')->search( { body_id => 1 } )->delete();
+    FixMyStreet::DB->resultset('Contact')->search( { body_id => 1 } )->delete();
 
-    my $contact = FixMyStreet::App->model('DB::Contact')->create(
+    my $contact = FixMyStreet::DB->resultset('Contact')->create(
         {
             body_id => 1,
             email =>   'contact@example.com',
@@ -66,17 +66,17 @@ subtest 'check non open311 contacts marked as deleted' => sub {
     $processor->_current_body( $body );
     $processor->process_services( $service_list );
 
-    my $contact_count = FixMyStreet::App->model('DB::Contact')->search( { body_id => 1 } )->count();
+    my $contact_count = FixMyStreet::DB->resultset('Contact')->search( { body_id => 1 } )->count();
     is $contact_count, 4, 'correct number of contacts';
 
-    $contact_count = FixMyStreet::App->model('DB::Contact')->search( { body_id => 1, deleted => 1 } )->count();
+    $contact_count = FixMyStreet::DB->resultset('Contact')->search( { body_id => 1, deleted => 1 } )->count();
     is $contact_count, 1, 'correct number of deleted contacts';
 };
 
 subtest 'check email changed if matching category' => sub {
-    FixMyStreet::App->model('DB::Contact')->search( { body_id => 1 } )->delete();
+    FixMyStreet::DB->resultset('Contact')->search( { body_id => 1 } )->delete();
 
-    my $contact = FixMyStreet::App->model('DB::Contact')->create(
+    my $contact = FixMyStreet::DB->resultset('Contact')->create(
         {
             body_id => 1,
             email =>   '009',
@@ -102,14 +102,14 @@ subtest 'check email changed if matching category' => sub {
     is $contact->confirmed, 1, 'contact still confirmed';
     is $contact->deleted, 0, 'contact still not deleted';
 
-    my $contact_count = FixMyStreet::App->model('DB::Contact')->search( { body_id => 1 } )->count();
+    my $contact_count = FixMyStreet::DB->resultset('Contact')->search( { body_id => 1 } )->count();
     is $contact_count, 3, 'correct number of contacts';
 };
 
 subtest 'check category name changed if updated' => sub {
-    FixMyStreet::App->model('DB::Contact')->search( { body_id => 1 } )->delete();
+    FixMyStreet::DB->resultset('Contact')->search( { body_id => 1 } )->delete();
 
-    my $contact = FixMyStreet::App->model('DB::Contact')->create(
+    my $contact = FixMyStreet::DB->resultset('Contact')->create(
         {
             body_id => 1,
             email =>   '001',
@@ -136,14 +136,14 @@ subtest 'check category name changed if updated' => sub {
     is $contact->confirmed, 1, 'contact still confirmed';
     is $contact->deleted, 0, 'contact still not deleted';
 
-    my $contact_count = FixMyStreet::App->model('DB::Contact')->search( { body_id => 1 } )->count();
+    my $contact_count = FixMyStreet::DB->resultset('Contact')->search( { body_id => 1 } )->count();
     is $contact_count, 3, 'correct number of contacts';
 };
 
 subtest 'check conflicting contacts not changed' => sub {
-    FixMyStreet::App->model('DB::Contact')->search( { body_id => 1 } )->delete();
+    FixMyStreet::DB->resultset('Contact')->search( { body_id => 1 } )->delete();
 
-    my $contact = FixMyStreet::App->model('DB::Contact')->create(
+    my $contact = FixMyStreet::DB->resultset('Contact')->create(
         {
             body_id => 1,
             email =>   'existing@example.com',
@@ -158,7 +158,7 @@ subtest 'check conflicting contacts not changed' => sub {
 
     ok $contact, 'contact created';
 
-    my $contact2 = FixMyStreet::App->model('DB::Contact')->create(
+    my $contact2 = FixMyStreet::DB->resultset('Contact')->create(
         {
             body_id => 1,
             email =>   '001',
@@ -191,7 +191,7 @@ subtest 'check conflicting contacts not changed' => sub {
     is $contact2->confirmed, 1, 'second contact contact still confirmed';
     is $contact2->deleted, 0, 'second contact contact still not deleted';
 
-    my $contact_count = FixMyStreet::App->model('DB::Contact')->search( { body_id => 1 } )->count();
+    my $contact_count = FixMyStreet::DB->resultset('Contact')->search( { body_id => 1 } )->count();
     is $contact_count, 4, 'correct number of contacts';
 };
 
@@ -215,7 +215,7 @@ subtest 'check meta data population' => sub {
 </service_definition>
     ';
 
-    my $contact = FixMyStreet::App->model('DB::Contact')->find_or_create(
+    my $contact = FixMyStreet::DB->resultset('Contact')->find_or_create(
         {
             body_id => 1,
             email =>   '001',
@@ -395,7 +395,7 @@ for my $test (
             $services_xml =~ s/metadata>false/metadata>true/ms;
         }
 
-        my $contact = FixMyStreet::App->model('DB::Contact')->find_or_create(
+        my $contact = FixMyStreet::DB->resultset('Contact')->find_or_create(
             {
                 body_id => 1,
                 email =>   '100',
@@ -470,7 +470,7 @@ subtest 'check attribute ordering' => sub {
 </service_definition>
     ';
 
-    my $contact = FixMyStreet::App->model('DB::Contact')->find_or_create(
+    my $contact = FixMyStreet::DB->resultset('Contact')->find_or_create(
         {
             body_id => 1,
             email =>   '001',
@@ -572,7 +572,7 @@ subtest 'check bromely skip code' => sub {
 </service_definition>
     ';
 
-    my $contact = FixMyStreet::App->model('DB::Contact')->find_or_create(
+    my $contact = FixMyStreet::DB->resultset('Contact')->find_or_create(
         {
             body_id => 1,
             email =>   '001',