Merge remote-tracking branch 'upstream/master' into support-facebook-api

Author: nalabjp

lib/statistics/client.rb

@@ -1,5 +1,7 @@
 module Statistics
   class Client
+    class APIRateLimitError < ::StandardError; end
+
     class_attribute :debug
     self.debug = false
 
@@ -99,6 +101,12 @@ def fetch_events(group_id:, since_at: @default_since, until_at: @default_until)
         end
 
         events
+      rescue Faraday::ClientError => e
+        if e.response[:status] == 429
+          raise Client::APIRateLimitError
+        else
+          raise e
+        end
       end
     end
 

lib/tasks/statistics.rake

@@ -2,20 +2,38 @@ require_relative '../statistics.rb'
 
 namespace :statistics do
   desc '月次のイベント履歴を集計します'
-  task :aggregation, [:from_yyyymm, :to_yyyymm] => :environment do |tasks, args|
+  task :aggregation, [:from, :to] => :environment do |tasks, args|
     date_from_str = -> (str) {
-      d = %w(%Y%m %Y/%m %Y-%m).map { |fmt|
+      formats = %w(%Y%m %Y/%m %Y-%m)
+      d = formats.map { |fmt|
         begin
           Time.zone.strptime(str, fmt)
         rescue ArgumentError
+          Time.zone.local(str) if str.length == 4
         end
       }.compact.first
-      raise ArgumentError, "Invalid format: `#{str}`" if d.nil?
+      raise ArgumentError, "Invalid format: `#{str}`, allow format is #{formats.push('%Y').join(' or ')}" if d.nil?
       d
     }
 
-    from = (args[:from_yyyymm] ? date_from_str.call(args[:from_yyyymm]) : Time.current.prev_month).beginning_of_month
-    to   = (args[:to_yyyymm]   ? date_from_str.call(args[:to_yyyymm])   : Time.current.prev_month).end_of_month
+    from = if args[:from]
+             if args[:from].length == 4
+               date_from_str.call(args[:from]).beginning_of_year
+             else
+               date_from_str.call(args[:from]).beginning_of_month
+             end
+           else
+             Time.current.prev_month.beginning_of_month
+           end
+    to = if args[:to]
+           if args[:to].length == 4
+             date_from_str.call(args[:to]).end_of_year
+           else
+             date_from_str.call(args[:to]).end_of_month
+           end
+         else
+           Time.current.prev_month.end_of_month
+         end
 
     EventHistory.where(evented_at: from..to).delete_all
 
@@ -24,7 +42,15 @@ namespace :statistics do
       raise StopIteration if nm > to
       list << nm
     }.each { |date|
-      Statistics::Aggregation.run(date: date)
+      begin
+        puts "Aggregate for #{date.strftime('%Y/%m')}"
+        Statistics::Aggregation.run(date: date)
+      rescue Statistics::Client::APIRateLimitError
+        puts 'API rate limit exceeded.'
+        puts "This task will retry in 60 seconds from now(#{Time.zone.now})."
+        sleep 60
+        retry
+      end
     }
   end