From 5c06c6c6894a9094a8c60324ac000214964f5da8 Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Thu, 25 Apr 2019 15:41:22 +0100 Subject: Rename DB::ReportExtraFields to ReportExtraField. It was not being caught by rerun_dbic_loader.pl otherwise. --- .../App/Controller/Admin/ReportExtraFields.pm | 6 +-- perllib/FixMyStreet/App/Controller/Report/New.pm | 2 +- perllib/FixMyStreet/DB/Result/ReportExtraField.pm | 49 ++++++++++++++++++++++ perllib/FixMyStreet/DB/Result/ReportExtraFields.pm | 45 -------------------- .../FixMyStreet/DB/ResultSet/ReportExtraField.pm | 25 +++++++++++ .../FixMyStreet/DB/ResultSet/ReportExtraFields.pm | 25 ----------- t/app/controller/admin/reportextrafields.t | 10 +++-- 7 files changed, 84 insertions(+), 78 deletions(-) create mode 100644 perllib/FixMyStreet/DB/Result/ReportExtraField.pm delete mode 100644 perllib/FixMyStreet/DB/Result/ReportExtraFields.pm create mode 100644 perllib/FixMyStreet/DB/ResultSet/ReportExtraField.pm delete mode 100644 perllib/FixMyStreet/DB/ResultSet/ReportExtraFields.pm diff --git a/perllib/FixMyStreet/App/Controller/Admin/ReportExtraFields.pm b/perllib/FixMyStreet/App/Controller/Admin/ReportExtraFields.pm index 337fb4bed..0ddbb01f7 100644 --- a/perllib/FixMyStreet/App/Controller/Admin/ReportExtraFields.pm +++ b/perllib/FixMyStreet/App/Controller/Admin/ReportExtraFields.pm @@ -9,7 +9,7 @@ BEGIN { extends 'Catalyst::Controller'; } sub index : Path : Args(0) { my ( $self, $c ) = @_; - my @extras = $c->model('DB::ReportExtraFields')->search( + my @extras = $c->model('DB::ReportExtraField')->search( undef, { order_by => 'name' @@ -24,9 +24,9 @@ sub edit : Path : Args(1) { my $extra; if ( $extra_id eq 'new' ) { - $extra = $c->model('DB::ReportExtraFields')->new({}); + $extra = $c->model('DB::ReportExtraField')->new({}); } else { - $extra = $c->model('DB::ReportExtraFields')->find( $extra_id ) + $extra = $c->model('DB::ReportExtraField')->find( $extra_id ) or $c->detach( '/page_error_404_not_found' ); } diff --git a/perllib/FixMyStreet/App/Controller/Report/New.pm b/perllib/FixMyStreet/App/Controller/Report/New.pm index 83d0f8572..8944a9307 100644 --- a/perllib/FixMyStreet/App/Controller/Report/New.pm +++ b/perllib/FixMyStreet/App/Controller/Report/New.pm @@ -757,7 +757,7 @@ sub setup_report_extra_fields : Private { return unless $c->cobrand->allow_report_extra_fields; - my @extras = $c->model('DB::ReportExtraFields')->for_cobrand($c->cobrand)->for_language($c->stash->{lang_code})->all; + my @extras = $c->model('DB::ReportExtraField')->for_cobrand($c->cobrand)->for_language($c->stash->{lang_code})->all; $c->stash->{report_extra_fields} = \@extras; } diff --git a/perllib/FixMyStreet/DB/Result/ReportExtraField.pm b/perllib/FixMyStreet/DB/Result/ReportExtraField.pm new file mode 100644 index 000000000..f88169bba --- /dev/null +++ b/perllib/FixMyStreet/DB/Result/ReportExtraField.pm @@ -0,0 +1,49 @@ +use utf8; +package FixMyStreet::DB::Result::ReportExtraField; + +# Created by DBIx::Class::Schema::Loader +# DO NOT MODIFY THE FIRST PART OF THIS FILE + +use strict; +use warnings; + +use base 'DBIx::Class::Core'; +__PACKAGE__->load_components( + "FilterColumn", + "FixMyStreet::InflateColumn::DateTime", + "FixMyStreet::EncodedColumn", +); +__PACKAGE__->table("report_extra_fields"); +__PACKAGE__->add_columns( + "id", + { + data_type => "integer", + is_auto_increment => 1, + is_nullable => 0, + sequence => "report_extra_fields_id_seq", + }, + "name", + { data_type => "text", is_nullable => 0 }, + "cobrand", + { data_type => "text", is_nullable => 1 }, + "language", + { data_type => "text", is_nullable => 1 }, + "extra", + { data_type => "text", is_nullable => 1 }, +); +__PACKAGE__->set_primary_key("id"); + + +# Created by DBIx::Class::Schema::Loader v0.07035 @ 2019-04-25 15:41:27 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:yRF676ybdkfalMwZ9V+yhw + +__PACKAGE__->load_components("+FixMyStreet::DB::RABXColumn"); +__PACKAGE__->rabx_column('extra'); + +use Moo; +use namespace::clean -except => [ 'meta' ]; + +with 'FixMyStreet::Roles::Extra'; + +# You can replace this text with custom code or comments, and it will be preserved on regeneration +1; diff --git a/perllib/FixMyStreet/DB/Result/ReportExtraFields.pm b/perllib/FixMyStreet/DB/Result/ReportExtraFields.pm deleted file mode 100644 index 27a6bd2c6..000000000 --- a/perllib/FixMyStreet/DB/Result/ReportExtraFields.pm +++ /dev/null @@ -1,45 +0,0 @@ -use utf8; -package FixMyStreet::DB::Result::ReportExtraFields; - -# Created by DBIx::Class::Schema::Loader -# DO NOT MODIFY THE FIRST PART OF THIS FILE - -use strict; -use warnings; - -use base 'DBIx::Class::Core'; -__PACKAGE__->load_components("FilterColumn", "InflateColumn::DateTime", "EncodedColumn"); -__PACKAGE__->table("report_extra_fields"); -__PACKAGE__->add_columns( - "id", - { - data_type => "integer", - is_auto_increment => 1, - is_nullable => 0, - sequence => "report_extra_fields_id_seq", - }, - "name", - { data_type => "text", is_nullable => 0 }, - "cobrand", - { data_type => "text", is_nullable => 1 }, - "language", - { data_type => "text", is_nullable => 1 }, - "extra", - { data_type => "text", is_nullable => 1 }, -); -__PACKAGE__->set_primary_key("id"); - - -# Created by DBIx::Class::Schema::Loader v0.07035 @ 2017-07-28 09:51:34 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:LkfbsUInnEyXowdcCEPjUQ - -__PACKAGE__->load_components("+FixMyStreet::DB::RABXColumn"); -__PACKAGE__->rabx_column('extra'); - -use Moo; -use namespace::clean -except => [ 'meta' ]; - -with 'FixMyStreet::Roles::Extra'; - -# You can replace this text with custom code or comments, and it will be preserved on regeneration -1; diff --git a/perllib/FixMyStreet/DB/ResultSet/ReportExtraField.pm b/perllib/FixMyStreet/DB/ResultSet/ReportExtraField.pm new file mode 100644 index 000000000..9c47b1894 --- /dev/null +++ b/perllib/FixMyStreet/DB/ResultSet/ReportExtraField.pm @@ -0,0 +1,25 @@ +package FixMyStreet::DB::ResultSet::ReportExtraField; +use base 'DBIx::Class::ResultSet'; + +use strict; +use warnings; + +sub for_cobrand { + my ( $rs, $cobrand ) = @_; + + my $result = $rs->search( + { cobrand => [ undef, $cobrand->moniker, '' ] } + ); + return $result; +} + +sub for_language { + my ( $rs, $language ) = @_; + + my $result = $rs->search( + { language => [ undef, $language, '' ] } + ); + return $result; +} + +1; diff --git a/perllib/FixMyStreet/DB/ResultSet/ReportExtraFields.pm b/perllib/FixMyStreet/DB/ResultSet/ReportExtraFields.pm deleted file mode 100644 index 1348df3c2..000000000 --- a/perllib/FixMyStreet/DB/ResultSet/ReportExtraFields.pm +++ /dev/null @@ -1,25 +0,0 @@ -package FixMyStreet::DB::ResultSet::ReportExtraFields; -use base 'DBIx::Class::ResultSet'; - -use strict; -use warnings; - -sub for_cobrand { - my ( $rs, $cobrand ) = @_; - - my $result = $rs->search( - { cobrand => [ undef, $cobrand->moniker, '' ] } - ); - return $result; -} - -sub for_language { - my ( $rs, $language ) = @_; - - my $result = $rs->search( - { language => [ undef, $language, '' ] } - ); - return $result; -} - -1; diff --git a/t/app/controller/admin/reportextrafields.t b/t/app/controller/admin/reportextrafields.t index 4549eeadf..e02df864f 100644 --- a/t/app/controller/admin/reportextrafields.t +++ b/t/app/controller/admin/reportextrafields.t @@ -151,9 +151,11 @@ FixMyStreet::override_config { subtest 'Create and update new ReportExtraFields' => sub { my $extra_fields = []; - my $model = FixMyStreet::App->model('DB::ReportExtraFields'); + my $model = FixMyStreet::App->model('DB::ReportExtraField'); is $model->count, 0, 'no ReportExtraFields yet'; + $mech->get_ok("/admin/reportextrafields"); + $mech->get_ok("/admin/reportextrafields/new"); $mech->submit_form_ok({ with_fields => { name => "Test extra fields", @@ -289,7 +291,7 @@ FixMyStreet::override_config { LANGUAGES => [ 'en-gb,English,en_GB' ] }, sub { subtest "Extra fields are missing from cobrand that doesn't allow them" => sub { - my $object = FixMyStreet::App->model('DB::ReportExtraFields')->first; + my $object = FixMyStreet::App->model('DB::ReportExtraField')->first; $object->update({ language => "", cobrand => ""}); $mech->get_ok("/report/new?longitude=-1.351488&latitude=51.847235&category=" . $contact->category); @@ -298,7 +300,7 @@ FixMyStreet::override_config { }; }; -FixMyStreet::App->model('DB::ReportExtraFields')->delete_all; +FixMyStreet::App->model('DB::ReportExtraField')->delete_all; $mech->log_out_ok; subtest 'Reports are created with correct extra metadata' => sub { @@ -306,7 +308,7 @@ subtest 'Reports are created with correct extra metadata' => sub { ALLOWED_COBRANDS => [ 'tester' ], MAPIT_URL => 'http://mapit.uk/', }, sub { - my $model = FixMyStreet::App->model('DB::ReportExtraFields'); + my $model = FixMyStreet::App->model('DB::ReportExtraField'); my $extra_fields = $model->find_or_create({ name => "Test extra fields", language => "", -- cgit v1.2.3