diff --git a/app/models/concerns/predict_planting.rb b/app/models/concerns/predict_planting.rb index 8298455d7..52be89be6 100644 --- a/app/models/concerns/predict_planting.rb +++ b/app/models/concerns/predict_planting.rb @@ -32,12 +32,8 @@ module PredictPlanting def percentage_grown return 100 if finished? return unless finish_is_predicatable? - if growing? - percent = (days_since_planted / expected_lifespan.to_f) * 100 - return 100 if percent > 100 - return percent - end - return 0 if planted? + return calculate_percentage_grown if growing? + 0 if planted? end # states @@ -56,5 +52,12 @@ module PredictPlanting finish_predicted_at.present? && finish_predicted_at <= Time.zone.today end + + private + + def calculate_percentage_grown + percent = (days_since_planted / expected_lifespan.to_f) * 100 + (percent > 100 ? 100 : percent) + end end end