Commit: 3f6142e14be20c059148afa871400919af88647f - mmw_serv (git)

Commit MetaInfo

• Revision: 3f6142e14be20c059148afa871400919af88647f (tree)
• Time: 2017-08-11 07:07:41
• Author: HMML <hmml3939@gmai...>
• Commiter: HMML

Log Message

Fix date calculate with timezone...

Change Summary

• modified: app/controllers/api/v1/forecasts_controller.rb
• modified: app/jobs/fetch_jma_content_job.rb

Incremental Difference

--- a/app/controllers/api/v1/forecasts_controller.rb
+++ b/app/controllers/api/v1/forecasts_controller.rb
@@ -11,7 +11,7 @@ class Api::V1::ForecastsController < ApplicationController
     @area = Area.find_by!(ns: params.require(:area_ns), code: params.require(:area_code))
     @area.timezone? and
       Time.zone = @area.timezone
-    start_date = (Time.now - 4.hours).to_date
+    start_date = Time.zone.now.to_date
     @forecasts = @area.forecasts.where('date >= ?', start_date).order(date: :asc)
   end
 end

--- a/app/jobs/fetch_jma_content_job.rb
+++ b/app/jobs/fetch_jma_content_job.rb
@@ -116,7 +116,7 @@ class FetchJmaContentJob < ApplicationJob
         end
       end
       changed_area_ids.present? and
-        Forecast.where("area_id IN (?) AND date < ?", changed_area_ids, Time.now.to_date).destroy_all
+        Forecast.where("area_id IN (?) AND date < ?", changed_area_ids, (Time.zone.now - 1.day).to_date).destroy_all
     end # Area.transaction
   end