Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert "EPR pending convictions check" #1279

Merged
merged 1 commit into from
Oct 27, 2022
Merged

Revert "EPR pending convictions check" #1279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 3 additions & 14 deletions app/models/waste_carriers_engine/registration.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,12 @@ class Registration

field :renew_token, type: String

def self.registrations_for_epr_export
def self.lower_tier_or_unexpired_or_in_covid_grace_window
beginning_of_today = Time.now.in_time_zone("London").beginning_of_day
normal_expiry_date = beginning_of_today + 1.day
earliest_day_of_covid_grace_window = beginning_of_today - Rails.configuration.covid_grace_window.days + 1.day

unscoped.any_of(
any_of(
# Registration is lower tier
{ tier: LOWER_TIER },
# Registration expires on or after the current date
Expand All @@ -49,18 +49,7 @@ def self.registrations_for_epr_export
{ expires_on: {
"$lt" => Rails.configuration.end_of_covid_extension,
"$gte" => earliest_day_of_covid_grace_window
} },
# Registration is a renewal pending a convictions check, without a pending payment
{ "$and": [
# ... has declared convictions
declared_convictions: "yes",
# .... is a renewal
"past_registrations.0": { "$exists": true },
# ... is pending
"metaData.status": "PENDING",
# ... does not have a pending payment
"financeDetails.balance": { "$lte": 0 }
] }
} }
)
end

Expand Down
76 changes: 12 additions & 64 deletions spec/models/waste_carriers_engine/registration_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,78 +174,26 @@ module WasteCarriersEngine
end
end

describe ".registrations_for_epr_export" do

before do
describe ".lower_tier_or_unexpired_or_in_covid_grace_window" do
it "returns registrations who are lower tier, unexpired or in the COVID grace window" do
allow(Rails.configuration).to receive(:end_of_covid_extension).and_return(10.days.ago.to_date)
allow(Rails.configuration).to receive(:covid_grace_window).and_return(30)
end

subject(:result) { described_class.registrations_for_epr_export }

it "returns registrations which are unexpired" do
future_expire_date = create(:registration, :has_required_data, expires_on: 2.days.from_now)
expect(result).to include(future_expire_date)
end

it "does not return registrations which are expired" do
expired = create(:registration, :has_required_data, expires_on: 2.days.ago)
expect(result).not_to include(expired)
end

it "does not return registrations without an expiry date" do
not_activated = create(:registration, :has_required_data, expires_on: nil)
expect(result).not_to include(not_activated)
end

it "returns registrations which are lower tier" do
lower_tier = create(:registration, :has_required_data, :lower_tier, expires_on: nil)
expect(result).to include(lower_tier)
end

it "returns registrations which are in the COVID grace window" do
past_covid_extension_in_grace_window = create(:registration, :has_required_data, expires_on: 20.days.ago)
expect(result).to include(past_covid_extension_in_grace_window)
end

it "does not return registrations which are not in the COVID grace window" do
past_covid_extension_edge_grace_window = create(:registration, :has_required_data, expires_on: 30.days.ago.beginning_of_day)
past_covid_extension_not_in_grace_window = create(:registration, :has_required_data, expires_on: 40.days.ago)
expect(result).not_to include(past_covid_extension_not_in_grace_window)
end

context "when a registration is pending a conviction check" do
let(:pending_check_registration) do
create(:registration,
:has_required_data,
:is_pending,
past_registrations: past_registrations,
declared_convictions: "yes",
finance_details: build(:finance_details, balance: balance))
end
let(:past_registrations) { [create(:registration, :has_required_data)] }
let(:balance) { 0 }

before { pending_check_registration }

it "returns registrations which are pending a conviction check" do
expect(result).to include(pending_check_registration)
end

context "with an unpaid balance" do
let(:balance) { 1 }

it "does not include the registration" do
expect(result).not_to include(pending_check_registration)
end
end
past_not_covid = create(:registration, :has_required_data, expires_on: 2.days.ago)
lower_tier = create(:registration, :has_required_data, :lower_tier, expires_on: nil)

context "when not a renewal" do
let(:past_registrations) { [] }
result = described_class.lower_tier_or_unexpired_or_in_covid_grace_window

it "does not include the registration" do
expect(result).not_to include(pending_check_registration)
end
end
expect(result).to include(future_expire_date)
expect(result).to include(past_covid_extension_in_grace_window)
expect(result).to include(lower_tier)
expect(result).not_to include(past_covid_extension_not_in_grace_window)
expect(result).not_to include(past_covid_extension_edge_grace_window)
expect(result).not_to include(past_not_covid)
end
end

Expand Down