Refactor: Forecast#forecast_for -> Forecast#date

This is much clearer, `#forecast_for` was a poor initial choice!
dxw · Oct 7, 2024 · 8f057f6 · 8f057f6
1 parent 5b146a5
commit 8f057f6
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 15 deletions.
diff --git a/app/lib/forecast_factory.rb b/app/lib/forecast_factory.rb
@@ -10,7 +10,7 @@ def self.build(forecast_representation)
       .map do |forecast|
       Forecast.new({
         obtained_at: obtained_at,
-        forecast_for: Date.parse(forecast.fetch("forecast_date")),
+        date: Date.parse(forecast.fetch("forecast_date")),
 
         zone: ForecastZone.new(
           id: zone.fetch("zone_id"),

diff --git a/app/models/air_quality_alert.rb b/app/models/air_quality_alert.rb
@@ -10,7 +10,7 @@ def initialize(forecast)
   }
 
   def date
-    @forecast.forecast_for
+    @forecast.date
   end
 
   def daqi_level

diff --git a/app/models/forecast.rb b/app/models/forecast.rb
@@ -1,9 +1,9 @@
 class Forecast
-  attr_reader :obtained_at, :forecast_for, :zone, :air_pollution, :uv, :pollen, :temperature
+  attr_reader :obtained_at, :date, :zone, :air_pollution, :uv, :pollen, :temperature
 
   def initialize(attrs)
     @obtained_at = attrs.fetch(:obtained_at)
-    @forecast_for = attrs.fetch(:forecast_for)
+    @date = attrs.fetch(:date)
     @zone = attrs.fetch(:zone)
     @air_pollution = attrs.fetch(:air_pollution)
     @uv = attrs.fetch(:uv)
@@ -25,7 +25,7 @@ def air_quality_alert
   def inspect
     attr_values = [
       "@obtained_at=#{obtained_at}",
-      "@forecast_for=#{forecast_for}",
+      "@date=#{date}",
       "@zone=#{zone.inspect}",
       "@air_pollution=#{air_pollution.inspect}",
       "@uv=#{uv.inspect}",

diff --git a/app/views/forecasts/show.html.erb b/app/views/forecasts/show.html.erb
@@ -31,7 +31,7 @@
         head.with_row do |row|
         row.with_cell(text: '')
         @forecasts.map { |forecast|
-          row.with_cell(text: forecast.forecast_for.to_formatted_s(:short))
+          row.with_cell(text: forecast.date.to_formatted_s(:short))
         }
 
         end; end; table.with_body do |body|
@@ -40,7 +40,7 @@
         @forecasts.map { | forecast|
           row.with_cell(
             text: forecast.air_pollution.daqi_label,
-            html_attributes: { "data-date" => forecast.forecast_for}
+            html_attributes: { "data-date" => forecast.date}
           )
         }
         end;
@@ -49,7 +49,7 @@
         @forecasts.map { | forecast|
           row.with_cell(
             text: "#{forecast.uv.daqi_label} - #{forecast.uv.guidance}",
-            html_attributes: { "data-date" => forecast.forecast_for}
+            html_attributes: { "data-date" => forecast.date}
           )
         }
         end;
@@ -58,7 +58,7 @@
           @forecasts.map { | forecast|
             row.with_cell(
               text: [forecast.pollen.daqi_label, forecast.pollen.guidance].join(" - "),
-              html_attributes: { "data-date" => forecast.forecast_for}
+              html_attributes: { "data-date" => forecast.date}
             )
           }
         end;
@@ -67,7 +67,7 @@
           @forecasts.map { | forecast|
             row.with_cell(
               text: "#{forecast.temperature.min.round}-#{forecast.temperature.max.round}°C",
-              html_attributes: { "data-date" => forecast.forecast_for}
+              html_attributes: { "data-date" => forecast.date}
             )
           }
         end;

diff --git a/spec/factories/forecasts.rb b/spec/factories/forecasts.rb
@@ -1,6 +1,6 @@
 # #<Forecast
 # @obtained_at=2024-10-02 15:38:00 +0100
-# @forecast_for=2024-10-02
+# @date=2024-10-02
 # @zone=#<ForecastZone
 #   @id=29
 #   @name=Southwark
@@ -22,7 +22,7 @@
 FactoryBot.define do
   factory :forecast do
     obtained_at { Time.current }
-    forecast_for { Date.tomorrow }
+    date { Date.tomorrow }
     zone { FactoryBot.build(:forecast_zone) }
     air_pollution { FactoryBot.build(:air_pollution_prediction) }
     uv { FactoryBot.build(:uv_prediction) }
@@ -32,7 +32,7 @@
     initialize_with {
       new(
         obtained_at: obtained_at,
-        forecast_for: forecast_for,
+        date: date,
         zone: zone,
         air_pollution: air_pollution,
         uv: uv,

diff --git a/spec/lib/forecast_factory_spec.rb b/spec/lib/forecast_factory_spec.rb
@@ -40,7 +40,7 @@
 
       aggregate_failures do
         expect(forecast.obtained_at).to eq(Time.zone.parse("02-10-2024 15:38"))
-        expect(forecast.forecast_for).to eq(Date.parse("2024-10-02"))
+        expect(forecast.date).to eq(Date.parse("2024-10-02"))
 
         expect(forecast.zone.name).to eq("Southwark")
         expect(forecast.zone.id).to eq(29)

diff --git a/spec/models/air_quality_alert_spec.rb b/spec/models/air_quality_alert_spec.rb
@@ -2,7 +2,7 @@
   let(:forecast) do
     FactoryBot.build(
       :forecast,
-      forecast_for: Date.tomorrow,
+      date: Date.tomorrow,
       air_pollution: FactoryBot.build(:air_pollution_prediction, :high)
     )
   end