diff --git a/app/models/archived/debate_outcome.rb b/app/models/archived/debate_outcome.rb index 84cc129a5..eabb73ec4 100644 --- a/app/models/archived/debate_outcome.rb +++ b/app/models/archived/debate_outcome.rb @@ -1,5 +1,3 @@ -require_dependency 'archived' - module Archived class DebateOutcome < ActiveRecord::Base VALID_OTHER_URLS = /\Ahttps?:\/\/(?:[a-z][\-\.a-z0-9]{0,63}\.parliament\.uk|www\.youtube\.com).*\z/ diff --git a/app/models/archived/government_response.rb b/app/models/archived/government_response.rb index 97873ff17..b1fe6f08e 100644 --- a/app/models/archived/government_response.rb +++ b/app/models/archived/government_response.rb @@ -1,5 +1,3 @@ -require_dependency 'archived' - module Archived class GovernmentResponse < ActiveRecord::Base belongs_to :petition, touch: true diff --git a/app/models/archived/note.rb b/app/models/archived/note.rb index 1cba88ad7..d84aa2c46 100644 --- a/app/models/archived/note.rb +++ b/app/models/archived/note.rb @@ -1,5 +1,3 @@ -require_dependency 'archived' - module Archived class Note < ActiveRecord::Base belongs_to :petition, touch: true diff --git a/app/models/archived/petition.rb b/app/models/archived/petition.rb index d1fa782ad..59eed4bbc 100644 --- a/app/models/archived/petition.rb +++ b/app/models/archived/petition.rb @@ -1,5 +1,4 @@ require 'textacular/searchable' -require_dependency 'archived' module Archived class Petition < ActiveRecord::Base diff --git a/app/models/archived/petition/email.rb b/app/models/archived/petition/email.rb index 5d2a7515a..34cd2ee7d 100644 --- a/app/models/archived/petition/email.rb +++ b/app/models/archived/petition/email.rb @@ -1,5 +1,3 @@ -require_dependency 'archived' - module Archived class Petition < ActiveRecord::Base class Email < ActiveRecord::Base diff --git a/app/models/archived/petition/mailshot.rb b/app/models/archived/petition/mailshot.rb index 7fffe9771..8bc6b3352 100644 --- a/app/models/archived/petition/mailshot.rb +++ b/app/models/archived/petition/mailshot.rb @@ -1,5 +1,3 @@ -require_dependency 'archived' - module Archived class Petition < ActiveRecord::Base class Mailshot < ActiveRecord::Base diff --git a/app/models/archived/rejection.rb b/app/models/archived/rejection.rb index 09fd499c2..0285347c7 100644 --- a/app/models/archived/rejection.rb +++ b/app/models/archived/rejection.rb @@ -1,5 +1,3 @@ -require_dependency 'archived' - module Archived class Rejection < ActiveRecord::Base belongs_to :petition, touch: true diff --git a/app/models/archived/signature.rb b/app/models/archived/signature.rb index acad13283..a4e420d03 100644 --- a/app/models/archived/signature.rb +++ b/app/models/archived/signature.rb @@ -1,7 +1,5 @@ require 'ipaddr' -require_dependency 'archived' - module Archived class Signature < ActiveRecord::Base include GeoipLookup, Anonymize diff --git a/app/models/constituency.rb b/app/models/constituency.rb index 5fa5dcf68..d6c27f61e 100644 --- a/app/models/constituency.rb +++ b/app/models/constituency.rb @@ -1,6 +1,3 @@ -require_dependency 'constituency/api_client' -require_dependency 'constituency/api_query' - class Constituency < ActiveRecord::Base MP_URL = "https://members.parliament.uk/member/%{mp_id}/contact" POSTCODE = /\A([A-Z]{1,2}[0-9][0-9A-Z]?)([0-9]|[0-9][A-BD-HJLNP-UW-Z]{2})?\z/i @@ -102,11 +99,11 @@ def for_parliament(parliament) current end end - + def between(opening_at, dissolution_at) where(arel_table[:start_date].lteq(opening_at).and(arel_table[:end_date].gteq(dissolution_at).or(arel_table[:end_date].eq(nil)))) end - + def external_ids pluck(:external_id) end