今週のマイルストーンがない場合は先週のものを表示

great-h · Dec 31, 2014 · cd87fae · cd87fae
1 parent 6d13932
commit cd87fae
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
@@ -3,12 +3,16 @@ def index
     @repo = 'great-h/great-h.github.io'
     @milestone = milestone_name
     @issues = Issue.filter_milestone(@repo, @milestone)
+    if @issues.length == 0
+      @milestone = milestone_name(Date.today.prev_week)
+      @issues = Issue.filter_milestone(@repo, @milestone)
+    end
     Rails.logger.info(Github.rate_limit.to_s)
   end
 
   private
 
-  def milestone_name
-    Date.today.beginning_of_week(:wednesday).strftime('%Y%m%d')
+  def milestone_name(date = Date.today)
+    date.beginning_of_week(:wednesday).strftime('%Y%m%d')
   end
 end
diff --git a/app/models/issue.rb b/app/models/issue.rb
@@ -1,7 +1,7 @@
 class Issue
   def self.filter_milestone(repo, name)
     milestone = Milestone.find(repo, name)
-    raise "not found milestone: #{milestone.title}" if milestone.nil?
+    return [] if milestone.nil?
 
     Rails.cache.fetch(issues_key(repo, name), expires_in: 3.minutes) do
       Github.client.list_issues(repo, milestone: milestone.number, state: 'all')