meetalendar 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73604a9cc0b86b606d42ffe229c51672b3ea933edb58c1392c65b15a11f1aead
-  data.tar.gz: a0e8b7fcd6e9c163e054933198a0b3aafe224738ce541081b96fc1db11f28b6c
+  metadata.gz: ae3d433c1520818ba3b4ae9234da0d298dca9295a963a44d8c006560101f285a
+  data.tar.gz: adf92c0d823795fb1c3d7409c6c9f2d48d04fc4e908bca0360c4c4fa6eb4e9e0
 SHA512:
-  metadata.gz: a50451ed147c3bb6b9b45721bb8ca0a01af9be07f47139f027aed7789358b489f6de88c3cbabc8ee6cbfbb8081e10289c97d1649e52e3b3907a1dfbb4bd73508
-  data.tar.gz: 286e5134a8173857b29d7425795ab11eb1eb2e373ecfcdaff1dc18c6108a31cde45ef672bfb5e79fee0d83d104714e907c4b90d82df6d7841517555495222638
+  metadata.gz: 238d482fa5cc2eea84f5a7f95c77b583bb9692ecf75ef4c96c19b9d862f0edb1ebbfc173108fd6c1ceab7c145bf10c52bcc18922801990df507b887750f795ab
+  data.tar.gz: 3399deaac0a1a5f86ec2bdb4fb1bf25e7d03eb971ab6c4df9d7710a76ba05fb2c3959dba52cf28f2f3dfe95adff8cc2b066f4a698263cff3c5320dccdf5b7b7d

data/.gitignore

@@ -14,3 +14,4 @@ Gemfile.lock
 .ruby-version
 /.sass-cache
 coverage/
+meetalendar-*.gem

data/README.md

@@ -42,7 +42,17 @@ $ bundle exec rake db:migrate
 ```
 
 ## Contributing
-Just try your best.
+Just try your best. Maybe you can achieve one of these goals.
+
+- [_] Wenn keine "approved cities" eingetragen sind, (oder wenn ein * oder ähnlich eingetragen ist) dann sollen alle Termine übertragen werden, egal in welcher Stadt sie stattfinden.
+- [_] Wenn keine City in der Venue im Event eingetragen ist, dann soll dieser Termin erstmal mit übertragen werden, und sofern bei einer späteren Syncronisation festgestellt wird, dass dieses bereits im GCal eingetragene Event doch nicht hätte übertragen werden sollen, weil es in einer "nicht approvten" Stadt stattfindet, dann soll es wieder aus dem GCal gelöscht werden. (Aber nur für zukünftige Events, nicht rückwirkend auf jene, die schon stattgefunden haben.)
+- [_] Wenn die "approvten cities" geändert werden, sollen ebenfalls die Termine, die noch in der Zukunft liegen entweder hinzugefügt oder gelöscht werden im GCal.
+
+- Erweiterung der Admin-Ansicht, sodass auch einzelne bisher ausgeschlossene Events "von Hand" hinzugefügt werden können.
+  - [_] Noch mal darüber sprechen, woher die Events kommen sollen? So eine Art von Suche bei der die bereits selektierten/gespeicherten Gruppen ihre nächsten (für 3 Monate) Events anzeigen und man diese trotz abweichender Städte in den GCal übertregen kann?
+
+- [_] Kann man erkennen, ob ein Termin "von Hand" eingetragen wurde (bei Meetup) oder ob es ein sich einfach jeden Monat zu einem bestimmten Termin wiederholt, aber noch keine Details eingetragen sind.
+  - Bei von Hand eingetragenen Terminen, die auch weit in der Zukunft liegen können, sollte man diese mit übertragen, wenn sie aber wiederholt werden ist ab 3 Monaten in der Zukunft wohl sowieso noch kein sinnvoller Inhalt vorhanden und diese sollten dann nicht übertragen werden.
 
 ## License
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).

data/app/models/comfy/admin/meetalendar/meetups_calendar_syncer.rb

@@ -47,12 +47,6 @@ module Comfy::Admin::Meetalendar::MeetupsCalendarSyncer
     credentials
   end
 
-  def self.add_to_key(current_key_data, to_add_data)
-    return_key_data = current_key_data.nil? ? [] : current_key_data.class == [].class ? current_key_data : [].push(current_key_data)
-    return_key_data.push(to_add_data)
-    return_key_data
-  end
-
   def self.get_path_authorized(path, args = {})
     return_hash = {}
     client = HTTPClient.new
@@ -75,7 +69,7 @@ module Comfy::Admin::Meetalendar::MeetupsCalendarSyncer
         request_query_args = {"client_id": meetup_credentials["client_id"], "client_secret": meetup_credentials["client_secret"], "grant_type": "refresh_token", "refresh_token": "#{current_tokens["refresh_token"]}"}
         post_return = client.post_content(request_uri, request_query_args)
 
-        if post_return.nil? || post_return.status == 401
+        if post_return.nil? || post_return.status == Rack::Utils::SYMBOL_TO_STATUS_CODE[:unauthorized]
           Rails.logger.error "Authorization with current token failed and token could not be refreshed. Was authorization to meetup api revoked?"
           raise ::ActiveResource::UnauthorizedAccess, "To access this path you need to have authenticated the Meetup API successfully."
         else
@@ -88,8 +82,8 @@ module Comfy::Admin::Meetalendar::MeetupsCalendarSyncer
           request_query_args = args.merge({"access_token" => (current_tokens["access_token"])})
           result = client.request("GET", request_uri, request_query_args)
   
-          if result.nil? || result.status == 401
-            # really no success
+          if result.nil? || result.status != Rack::Utils::SYMBOL_TO_STATUS_CODE[:ok]
+            # still no success
             Rails.logger.error "Authorization with current token failed, token was refreshed but authorization still fails. Was authorization to meetup api revoked?"
             raise ::ActiveResource::UnauthorizedAccess, "To access this path you need to have authenticated the Meetup API successfully."
           else
@@ -105,32 +99,61 @@ module Comfy::Admin::Meetalendar::MeetupsCalendarSyncer
     parsed_path
   end
 
-  def self.gather_meetups_in_approved_cities(time_now)
+  def self.gather_selected_events(time_now)
     @meetups = MeetupGroup.all
     group_ids = @meetups.map{ |meetup| meetup.group_id }
     group_ids_approved_cities = @meetups.map{|meetup| ["#{meetup.group_id}", meetup.approved_cities.downcase.split(%r{,\s*})]}.to_h
 
     request_result = Comfy::Admin::Meetalendar::MeetupsCalendarSyncer.get_path_authorized("/find/upcoming_events", {"page": 200})
 
-    upcoming_events = request_result.nil? ? {} : request_result
-    upcoming_events = upcoming_events.nil? || upcoming_events.empty? ? [] : upcoming_events["events"]
-    upcoming_events_of_groups = upcoming_events.select{|event|
-      !event["group"].nil? &&
-      group_ids.include?(event["group"]["id"]) &&
-      !event["venue"].nil? &&
-      group_ids_approved_cities["#{event["group"]["id"]}"].include?(event['venue']['city'].to_s.downcase)}
-
-    grouped_upcoming_events = upcoming_events_of_groups.group_by{|event| event["group"]["id"]}
-    # NOTE(Schau): Very likely i will be able to refactor this to be more clear.
-    limited_upcoming_events = Hash[grouped_upcoming_events.map{|k, v| [k, v.select{|event| Time.at(Rational(event["time"].to_i, 1000)) > time_now}.sort_by{|event| event["time"].to_i}.take(2)]}].select{|k, v| v.any?}
-    listed_upcoming_events = limited_upcoming_events.map{|k, v| v.first}
+    upcoming_events = request_result.nil? || request_result.empty? ? [] : request_result.dig("events")
+    selected_groups_upcoming_events = upcoming_events.select{|event| group_ids.include?(event.dig("group", "id"))}
+
+    upcoming_events_of_groups = selected_groups_upcoming_events.select do |event|
+      selected_group_has_approved_cities = !group_ids_approved_cities.dig("#{event.dig("group", "id")}").empty?
+
+      event_has_group = !event.dig("group").nil?
+      events_group_id_is_in_selected_group_ids = group_ids.include?(event.dig("group", "id"))
+
+      event_has_no_venue = event.dig("venue").nil?
+      event_has_venue = !event.dig("venue").nil?
+
+      event_venue_in_approved_cities = !selected_group_has_approved_cities ? true : group_ids_approved_cities.dig("#{event.dig("group", "id")}").include?(event.dig('venue', 'city').to_s.downcase)
+
+      !selected_group_has_approved_cities ||
+        (selected_group_has_approved_cities &&
+        event_has_group && events_group_id_is_in_selected_group_ids &&
+        (event_has_no_venue || (event_has_venue && event_venue_in_approved_cities)))
+    end
+
+    grouped_upcoming_events = upcoming_events_of_groups.group_by{|event| event.dig("group", "id")}
+    limited_upcoming_events = grouped_upcoming_events.map{|k, v| v.select{|event| Time.at(Rational(event.dig("time").to_i, 1000)) > time_now}}.first
   end
 
-  def self.sync_meetups_to_calendar(listed_upcoming_events)
+  def self.sync_meetups_to_calendar(listed_upcoming_events, calendar_id, time_now, time_in_future)
     calendar_service = Google::Apis::CalendarV3::CalendarService.new
     calendar_service.client_options.application_name = GOOGLE_CALENDAR_AUTH_APPLICATION_NAME
     calendar_service.authorization = authorize
 
+    begin
+      all_future_google_calendar_events = calendar_service.list_events(calendar_id, {time_max: DateTime.parse(time_in_future.to_s).to_s, time_min: DateTime.parse(time_now.to_s).to_s})
+    rescue => exception
+        Rails.logger.error "An exception occurred while loading current events from the google calendar. Exception: #{exception.message}"
+        raise ::ActiveResource::ClientError, "Could not load current events from the google calendar."
+    end
+
+    to_keep_event_gcal_ids = listed_upcoming_events.map{|mu_event| Digest::MD5.hexdigest(mu_event.dig('id').to_s)}
+    to_delete_event_ids = all_future_google_calendar_events.items.map{|gcal_event| gcal_event.id}.select{|gcal_event_id| !to_keep_event_gcal_ids.include?(gcal_event_id)}
+
+    to_delete_event_ids.each{ |event_id|
+      begin
+        calendar_service.delete_event(calendar_id, event_id)
+      rescue => exception
+          Rails.logger.error "An exception occurred while deleting unsubscribed events from the google calendar. Exception: #{exception.message}"
+          raise ::ActiveResource::ClientError, "Could not delete unsubscribed events from the google calendar."
+      end
+    }
+
     listed_upcoming_events.each{ |event|
       if event.key?('venue')
         venue_name_adress = event['venue']['name'] != event['venue']['address_1'] ? "#{event['venue']['name']}, #{event['venue']['address_1']}" : "#{event['venue']['address_1']}"
@@ -164,10 +187,10 @@ module Comfy::Admin::Meetalendar::MeetupsCalendarSyncer
 
       new_event = Google::Apis::CalendarV3::Event.new(new_event_hash)
       begin
-        calendar_service.update_event('primary', new_event.id, new_event)
+        calendar_service.update_event(calendar_id, new_event.id, new_event)
       rescue # TODO(Schau): If possible, figure out the exact exceptions to minimize "braodness of healing"
         begin
-          calendar_service.insert_event('primary', new_event)
+          calendar_service.insert_event(calendar_id, new_event)
         rescue => exception
             Rails.logger.error "An exception occurred while updating or inserting events into the google calendar. Exception: #{exception.message}"
             raise ::ActiveResource::ClientError, "Could not update or insert event into the google calendar."

data/lib/meetalendar/version.rb

@@ -2,6 +2,6 @@
 
 module Meetalendar
 
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 
 end

data/lib/tasks/meetalendar_tasks.rake

@@ -2,13 +2,13 @@ namespace :meetalendar do
   desc 'Syncronize selected meetup groups events with the configured google calendar.'
   task :syncronize => :environment do
     require 'comfy/admin/meetalendar/meetups_calendar_syncer'
-    Comfy::Admin::Meetalendar::MeetupsCalendarSyncer.sync_meetups_to_calendar(Comfy::Admin::Meetalendar::MeetupsCalendarSyncer.gather_meetups_in_approved_cities(Time.now))
+    Comfy::Admin::Meetalendar::MeetupsCalendarSyncer.sync_meetups_to_calendar(Comfy::Admin::Meetalendar::MeetupsCalendarSyncer.gather_selected_events(Time.now), 'andreasrschau@gmail.com', Time.now, Time.now + 1.year)
   end
 
 
   # desc 'Syncronize selected meetup groups events with the configured google calendar.'
   # task :testoncli => :environment do
   #   require 'comfy/admin/meetalendar/meetups_calendar_syncer'
-  #   Comfy::Admin::Meetalendar::MeetupsCalendarSyncer.gather_meetups_in_approved_cities(Time.now)
+  #   Comfy::Admin::Meetalendar::MeetupsCalendarSyncer.gather_selected_events(Time.now)
   # end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: meetalendar
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Andreas Schau @ HicknHack
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-29 00:00:00.000000000 Z
+date: 2019-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails