Upgrade connpass API: v1 -> v2

Gemfile

@@ -39,6 +39,7 @@ gem 'kramdown-parser-gfm'
 gem 'faraday'
 gem 'koala'
 gem 'lazy_high_charts', '1.5.8'
+gem 'connpass_api_v2' # https://github.com/sue445/connpass_api_v2-ruby
 
 # Protect from attacks for Security
 gem 'rack-attack'

Gemfile.lock

@@ -123,6 +123,9 @@ GEM
       logger (~> 1.5)
     concurrent-ruby (1.3.5)
     connection_pool (2.5.3)
+    connpass_api_v2 (0.1.0)
+      faraday (>= 2.0.0)
+      faraday-mashify
     crass (1.0.6)
     csv (3.3.4)
     date (3.4.1)
@@ -144,6 +147,9 @@ GEM
       faraday-net_http (>= 2.0, < 3.5)
       json
       logger
+    faraday-mashify (1.0.0)
+      faraday (~> 2.0)
+      hashie
     faraday-multipart (1.1.0)
       multipart-post (~> 2.0)
     faraday-net_http (3.4.0)
@@ -165,6 +171,7 @@ GEM
     globalid (1.2.1)
       activesupport (>= 6.1)
     hash-deep-merge (0.1.1)
+    hashie (5.0.0)
     i18n (1.14.7)
       concurrent-ruby (~> 1.0)
     io-console (0.8.0)
@@ -483,6 +490,7 @@ DEPENDENCIES
   bootsnap
   bootstrap-sass
   capybara
+  connpass_api_v2
   csv
   dotenv-rails
   factory_bot_rails

lib/event_service/client.rb

@@ -16,10 +16,10 @@ def get(path, params)
     def connection_for(endpoint, proxy)
       Faraday.new(endpoint, proxy: proxy) do |f|
         f.response :logger if self.class.debug
-        
+
         # faraday標準のJSONパーサーを使用
         f.response :json, parser_options: { symbolize_names: true }
-        
+
         # faraday標準のエラーハンドリングを使用
         f.response :raise_error, include_request: true
 

lib/event_service/providers/connpass.rb

@@ -1,25 +1,27 @@
+require 'connpass_api_v2'
+
 module EventService
   module Providers
       class Connpass
-        ENDPOINT = 'https://connpass.com/api/v1'.freeze
-        # NOTE: 期間は ym or ymd パラメータで指定(複数指定可能)、未指定時全期間が対象
-
         def initialize
-          @client = EventService::Client.new(ENDPOINT, proxy: ENV['FIXIE_URL'])
+          @client = ConnpassApiV2.client(ENV['CONNPASS_API_KEY'])
         end
 
         def search(keyword:)
-          @client.get('event/', { keyword: keyword, count: 100 })
+          @client.get_events(q: keyword, count: 100)
         end
 
         # NOTE: yyyymm, yyyymmdd は文字列を要素とする配列(Array[String])で指定
-        def fetch_events(series_id:, yyyymm: nil, yyyymmdd: nil)
-          series_id = series_id.join(',') if series_id.is_a?(Array)
+        def fetch_events(group_id:, yyyymm: nil, yyyymmdd: nil)
+          group_id = group_id.join(',') if group_id.is_a?(Array)
 
+          # API v1 -> v2 でパラメータ名が変更された
+          # https://connpass.com/about/api/v2/
+          # e.g. series_id -> group_id
           params = {
-            series_id: series_id,
-            start: 1,
-            count: 100
+            group_id: group_id,
+            start: 1,   # offset → start
+            count: 100  # limit → count
           }
 
           param_period_patern = []
@@ -35,17 +37,22 @@ def fetch_events(series_id:, yyyymm: nil, yyyymmdd: nil)
 
           param_period_patern.each do |param_period|
             loop do
-              # connpass は https://connpass.com/robots.txt を守らない場合は、アクセス制限を施すので、下記の sleep を入れるようにした https://connpass.com/about/api/
-              sleep 5
-              part = @client.get('event/', params.merge(param_period))
+              begin
+                args = params.merge(param_period).compact
+                res = @client.get_events(**args)
+              rescue ConnpassApiV2::Error => e
+                sleep 5 && retry if e.response&.status == 403
+
+                raise e
+              end
 
-              break if part['results_returned'].zero?
+              break if res.results_returned.zero?
 
-              events.push(*part.fetch('events'))
+              events.push(*res.events)
 
-              break if part.size < params[:count]
+              break if res.events.size < params[:count]
 
-              break if params[:start] + params[:count] > part['results_available']
+              break if params[:start] + params[:count] > res.results_available
 
               params[:start] += params[:count]
             end

lib/event_service/providers/doorkeeper.rb

@@ -6,7 +6,7 @@ class Doorkeeper
 
         def initialize
           @client = EventService::Client.new(ENDPOINT) do |c|
-            c.authorization(:Bearer, ENV.fetch('DOORKEEPER_API_TOKEN'))
+            c.request :authorization, 'Bearer', ENV.fetch('DOORKEEPER_API_TOKEN')
           end
           @default_since = '2010-07-01'.to_date.beginning_of_day
           @default_until = Time.zone.yesterday.end_of_day

lib/statistics/tasks/connpass.rb

@@ -20,7 +20,7 @@ def run
           dojo.dojo_event_services.for(:connpass).pluck(:group_id)
         end
 
-        @client.fetch_events(**@params.merge(series_id: group_ids)).each do |e|
+        @client.fetch_events(**@params.merge(group_id: group_ids)).each do |e|
           dojo_event_service = DojoEventService.find_by(group_id: e.dig('series', 'id').to_s)
           next unless dojo_event_service
 

lib/statistics/tasks/doorkeeper.rb

@@ -18,7 +18,8 @@ def initialize(dojos, period)
       def run
         @dojos.each do |dojo|
           dojo.dojo_event_services.for(:doorkeeper).each do |dojo_event_service|
-            @client.fetch_events(**@params.merge(group_id: dojo_event_service.group_id)).each do |e|
+            events = @client.fetch_events(**@params.merge(group_id: dojo_event_service.group_id))
+            (events || []).compact.each do |e|
               next unless e['group'].to_s == dojo_event_service.group_id
 
               EventHistory.create!(dojo_id:          dojo.id,

lib/upcoming_events/tasks/connpass.rb

@@ -12,21 +12,24 @@ def run
           dojo.dojo_event_services.for(:connpass).pluck(:group_id)
         end
 
-        @client.fetch_events(**@params.merge(series_id: group_ids)).each do |e|
-          dojo_event_service = DojoEventService.find_by(group_id: e.dig('series', 'id').to_s)
+        events = @client.fetch_events(**@params.merge(group_id: group_ids))
+        puts "[connpass] Fetched events: #{events.size}"
+        events.each do |e|
+          puts "[connpass] event_id: #{e.fetch('id')}, title: #{e.fetch('title')}"
+          dojo_event_service = DojoEventService.find_by(group_id: e.dig('group', 'id').to_s)
           next unless dojo_event_service
 
-          record = dojo_event_service.upcoming_events.find_or_initialize_by(event_id: e['event_id'])
+          record = dojo_event_service.upcoming_events.find_or_initialize_by(event_id: e.fetch('id'))
           record.update!(service_name: dojo_event_service.name,
-                         event_title:  e['title'],
-                         event_url:    e['event_url'],
-                         event_at:     Time.zone.parse(e['started_at']),
-                         event_end_at: Time.zone.parse(e['ended_at']),
-                         participants: e['accepted'],
-                         event_update_at: Time.zone.parse(e['updated_at']),
-                         address:      e['address'],
-                         place:        e['place'],
-                         limit:        e['limit'])
+                         event_title:  e.fetch('title'),
+                         event_url:    e.fetch('url'),
+                         event_at:     Time.zone.parse(e.fetch('started_at')),
+                         event_end_at: Time.zone.parse(e.fetch('ended_at')),
+                         participants: e.fetch('accepted'),
+                         event_update_at: Time.zone.parse(e.fetch('updated_at')),
+                         address:      e.fetch('address'),
+                         place:        e.fetch('place'),
+                         limit:        e.fetch('limit'))
         end
       end
 

lib/upcoming_events/tasks/doorkeeper.rb

@@ -10,20 +10,23 @@ def initialize(dojos, period)
       def run
         @dojos.each do |dojo|
           dojo.dojo_event_services.for(:doorkeeper).each do |dojo_event_service|
-            @client.fetch_events(**@params.merge(group_id: dojo_event_service.group_id)).each do |e|
-              next unless e['group'].to_s == dojo_event_service.group_id
+            events = @client.fetch_events(**@params.merge(group_id: dojo_event_service.group_id))
+            puts "[Doorkeeper] dojo_id: #{dojo.id}, group_id: #{dojo_event_service.group_id}, fetched events: #{events&.size || 0}"
+            (events || []).compact.each do |e|
+              puts "[Doorkeeper] event_id: #{e.fetch('id')}, title: #{e.fetch('title')}"
+              next unless e.fetch('group').to_s == dojo_event_service.group_id
 
-              record = dojo_event_service.upcoming_events.find_or_initialize_by(event_id: e['id'])
+              record = dojo_event_service.upcoming_events.find_or_initialize_by(event_id: e.fetch('id'))
               record.update!(service_name: dojo_event_service.name,
-                             event_title:  e['title'],
-                             event_url:    e['public_url'],
-                             participants: e['participants'],
-                             event_at:     Time.zone.parse(e['starts_at']),
-                             event_end_at: Time.zone.parse(e['ends_at']),
-                             event_update_at: Time.zone.parse(e['updated_at']),
-                             address:      e['address'],
-                             place:        e['venue_name'],
-                             limit:        e['ticket_limit'])
+                             event_title:  e.fetch('title'),
+                             event_url:    e.fetch('public_url'),
+                             participants: e.fetch('participants'),
+                             event_at:     Time.zone.parse(e.fetch('starts_at')),
+                             event_end_at: Time.zone.parse(e.fetch('ends_at')),
+                             event_update_at: Time.zone.parse(e.fetch('updated_at')),
+                             address:      e.fetch('address'),
+                             place:        e.fetch('venue_name'),
+                             limit:        e.fetch('ticket_limit'))
             end
           end
         end