Move calendar generation to Person, tzid

app/controllers/people_controller.rb

@@ -91,87 +91,10 @@ class PeopleController < ApplicationController
 
   # GET /c/:calendar_token
   def calendar
-    cal = Icalendar::Calendar.new
-    cal.x_wr_calname = 'Aardbei'
-
     response.content_type = 'text/calendar'
 
-    selection = @person
-      .participants
-      .joins(:activity)
-      .where('"end" > ?', 3.months.ago)
-
-    if params[:skipcancel]
-      selection = selection
-        .where.not(attending: false)
-    end
-
-    selection.each do |p|
-      a = p.activity
-
-      description_items = []
-      # The description consists of the following parts:
-      #  - The Participant's response and notes (if set),
-      #  - The Activity's description (if not empty),
-      #  - The names of the organizers,
-      #  - Subgroup information, if applicable,
-      #  - The URL.
-
-      # Response
-      yourresponse = "#{I18n.t 'activities.participant.yourresponse'}: #{p.human_attending}"
-
-      if p.notes.present?
-        yourresponse << " (#{p.notes})"
-      end
-
-      description_items << yourresponse
-
-      # Description
-      description_items << a.description if a.description.present?
-
-      # Organizers
-      orgi = a.organizer_names
-      orgi_names = orgi.join ', '
-      orgi_line = case orgi.count
-                  when 0 then I18n.t 'activities.organizers.no_organizers'
-                  when 1 then "#{I18n.t 'activities.organizers.one'}: #{orgi_names}"
-                  else "#{I18n.t 'activities.organizers.other'}: #{orgi_names}"
-                  end
-
-      description_items << orgi_line
-
-      # Subgroups
-      if a.subgroups.any?
-        if p.subgroup
-          description_items << "#{I18n.t 'activities.participant.yoursubgroup'}: #{p.subgroup}"
-        end
-
-        subgroup_names = a.subgroups.map(&:name).join ', '
-        description_items << "#{I18n.t 'activerecord.models.subgroup.other'}: #{subgroup_names}"
-
-      end
-
-      # URL
-      a_url = group_activity_url a.group, a
-      description_items << a_url
-
-      cal.event do |e|
-        e.uid = a_url
-        e.dtstart = a.start
-        e.dtend = a.end
-
-        e.status = p.ical_attending
-
-        e.summary = a.name
-        e.location = a.location
-
-        e.description = description_items.join "\n"
-
-        e.url = a_url
-      end
-    end
+    cal = @person.calendar_feed
 
-    cal.publish
     render plain: cal.to_ical
   end
 

app/models/person.rb

@@ -3,6 +3,7 @@
 # A Person may access the system by creating a User, and may have at most one
 # User.
 class Person < ApplicationRecord
+  include Rails.application.routes.url_helpers
   # @!attribute first_name
   #   @return [String]
   #     the person's first name. ('Vincent' in 'Vincent van Gogh'.)
@@ -102,6 +103,93 @@ class Person < ApplicationRecord
     person_calendar_url self.calendar_token
   end
 
+  # @return [Icalendar::Calendar]
+  #   this Person's upcoming activities feed.
+  def calendar_feed(skip_absent = false)
+    cal = Icalendar::Calendar.new
+    cal.x_wr_calname = 'Aardbei'
+
+    tzid = 1.seconds.since.time_zone.tzinfo.name
+
+    selection = self
+      .participants
+      .joins(:activity)
+      .where('"end" > ?', 3.months.ago)
+
+    if skip_absent
+      selection = selection
+        .where.not(attending: false)
+    end
+
+    selection.each do |p|
+      a = p.activity
+
+      description_items = []
+      # The description consists of the following parts:
+      #  - The Participant's response and notes (if set),
+      #  - The Activity's description (if not empty),
+      #  - The names of the organizers,
+      #  - Subgroup information, if applicable,
+      #  - The URL.
+
+      # Response
+      yourresponse = "#{I18n.t 'activities.participant.yourresponse'}: #{p.human_attending}"
+
+      if p.notes.present?
+        yourresponse << " (#{p.notes})"
+      end
+
+      description_items << yourresponse
+
+      # Description
+      description_items << a.description if a.description.present?
+
+      # Organizers
+      orgi = a.organizer_names
+      orgi_names = orgi.join ', '
+      orgi_line = case orgi.count
+                  when 0 then I18n.t 'activities.organizers.no_organizers'
+                  when 1 then "#{I18n.t 'activities.organizers.one'}: #{orgi_names}"
+                  else "#{I18n.t 'activities.organizers.other'}: #{orgi_names}"
+                  end
+
+      description_items << orgi_line
+
+      # Subgroups
+      if a.subgroups.any?
+        if p.subgroup
+          description_items << "#{I18n.t 'activities.participant.yoursubgroup'}: #{p.subgroup}"
+        end
+
+        subgroup_names = a.subgroups.map(&:name).join ', '
+        description_items << "#{I18n.t 'activerecord.models.subgroup.other'}: #{subgroup_names}"
+
+      end
+
+      # URL
+      a_url = group_activity_url a.group, a
+      description_items << a_url
+
+      cal.event do |e|
+        e.uid = a_url
+        e.dtstart = Icalendar::Values::DateTime.new a.start, tzid: tzid
+        e.dtend =   Icalendar::Values::DateTime.new a.end,   tzid: tzid
+
+        e.status = p.ical_attending
+
+        e.summary = a.name
+        e.location = a.location
+
+        e.description = description_items.join "\n"
+
+        e.url = a_url
+      end
+    end
+
+    cal.publish
+    cal
+  end
+
   private
   # Assert that the person's birth date, if any, lies in the past.
   def birth_date_cannot_be_in_future