Browse Source

feat: respond to PR comments

pull/1400/head
natdeanlewissoftwire 3 years ago
parent
commit
b3a84dbfb4
  1. 16
      app/models/validations/sales/financial_validations.rb
  2. 9
      spec/models/validations/sales/financial_validations_spec.rb

16
app/models/validations/sales/financial_validations.rb

@ -90,14 +90,14 @@ module Validations::Sales::FinancialValidations
ranges = EQUITY_RANGES_BY_YEAR.fetch(record.collection_start_year, DEFAULT_EQUITY_RANGES)
if (range = ranges[record.type])
if record.equity < range.min
record.errors.add :type, I18n.t("validations.financial.equity.under_min", min_equity: range.min)
record.errors.add :equity, I18n.t("validations.financial.equity.under_min", min_equity: range.min)
elsif record.equity > range.max
record.errors.add :type, I18n.t("validations.financial.equity.over_max", max_equity: range.max)
record.errors.add :equity, I18n.t("validations.financial.equity.over_max", max_equity: range.max)
end
return unless (range = ranges[record.type])
if record.equity < range.min
record.errors.add :type, I18n.t("validations.financial.equity.under_min", min_equity: range.min)
record.errors.add :equity, I18n.t("validations.financial.equity.under_min", min_equity: range.min)
elsif record.equity > range.max
record.errors.add :type, I18n.t("validations.financial.equity.over_max", max_equity: range.max)
record.errors.add :equity, I18n.t("validations.financial.equity.over_max", max_equity: range.max)
end
end

9
spec/models/validations/sales/financial_validations_spec.rb

@ -270,11 +270,10 @@ RSpec.describe Validations::Sales::FinancialValidations do
describe "#validate_equity_in_range_for_year_and_type" do
let(:record) { FactoryBot.create(:sales_log, saledate: now) }
before do
Timecop.freeze(now)
end
after do
around do |example|
Timecop.freeze(now) do
example.run
end
Timecop.unfreeze
end

Loading…
Cancel
Save