Add Pull Request Title and Body

Author: marcoroth

.github/workflows/meetups.yml

@@ -30,13 +30,14 @@ jobs:
         run: |
           echo "FORMATTED_DATE=$(date +'%B %d, %Y')" >> $GITHUB_ENV
           echo "BRANCH_TO_MERGE=new-meetups-$(date +'%Y-%m-%d')" >> $GITHUB_ENV
+          echo "PULL_REQUEST_TITLE=$(cat ./pull_request_title.txt)" >> $GITHUB_ENV
 
       - name: Commit New Meetups
         uses: stefanzweifel/git-auto-commit-action@v5
         with:
           # Optional. Commit message for the created commit.
           # Defaults to "Apply automatic changes"
-          commit_message: New Meetups on ${{ env.FORMATTED_DATE }}
+          commit_message: ${{ env.PULL_REQUEST_TITLE }}
 
           # Optional. Local and remote branch name where commit is going to be pushed
           #  to. Defaults to the current branch.
@@ -96,6 +97,6 @@ jobs:
           create_branch: true
 
       - name: Create Pull Request
-        run: gh pr create -B main -H ${{ env.BRANCH_TO_MERGE }} --title "New Meetups on ${{ env.FORMATTED_DATE }}" --body "Newly added Meetups on ${{ env.FORMATTED_DATE }}."
+        run: gh pr create -B main -H ${{ env.BRANCH_TO_MERGE }} --title "${{ env.PULL_REQUEST_TITLE }}" --body-file "./new_meetups.md"
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -1,3 +1,5 @@
 _site
 .jekyll-metadata
 bin/
+new_meetups.md
+pull_request_title.txt

Rakefile

@@ -69,10 +69,45 @@ task :verify_meetups do
 end
 
 task :fetch_meetups do
-  MeetupGroup.all.each do |group|
-    group.write_new_meetups!
+  File.write("./new_meetups.md", <<~MD)
+    ### New Meetups on #{Date.today.strftime("%B %d, %Y")}
+
+    | Title | Date | Meetup Group |
+    | ----- | ---- | ------------ |
+  MD
+
+  new_events = []
+
+  MeetupGroup.meetupdotcom.each do |group|
+    puts "Fetching Meetup.com Group: #{group.id}"
+
+    new_group_events = group.write_new_meetups!
+
+    new_events << new_group_events.zip(
+      new_group_events.map { |event| group.openstruct_to_md(event) }
+    )
+  end
+
+  new_events = new_events.flatten(1).to_h
+
+  new_events.sort_by { |event, _md| event.dateTime }.each do |_event, md|
+    File.write("./new_meetups.md", md, mode: "a+")
+  end
+
+  new_meetups_from_groups = new_events.group_by { |event, md| event.group["name"] }.transform_values { |value| value.map(&:first) }
+
+  if new_meetups_from_groups.keys.count == 1
+    pull_request_title =  "Add #{new_meetups_from_groups.keys.first} #{Date.parse(new_meetups_from_groups.first.last.sort_by(&:dateTime).first.dateTime).strftime("%B %Y")} Meetup"
+  elsif new_meetups_from_groups.keys.count > 1
+    *groups, last = new_meetups_from_groups.keys
+    pull_request_title = "Add #{groups.join(", ")} and #{last} Meetups"
+  else
+    pull_request_title = "New Meetups on #{Date.today.strftime("%B %d, %Y")}"
   end
 
+  puts "pull_request_title: #{pull_request_title}"
+  File.write("./pull_request_title.txt", pull_request_title)
+
   events = YAML.load_file("./_data/meetups.yml", permitted_classes: [Date])
 
   events.sort_by! { |event| [event["date"], event["name"]] }

meetup_client.rb

@@ -71,6 +71,13 @@ def headers(context)
             createdAt
             eventType
             isOnline
+            group {
+              id
+              name
+              country
+              state
+              city
+            }
           }
         }
       }
@@ -89,26 +96,6 @@ class MeetupGroup < FrozenRecord::Base
   scope :meetupdotcom, -> { where(service: "meetupdotcom" ) }
   scope :luma, -> { where(service: "luma" ) }
 
-  def location
-    unless @upcoming_events_result
-      upcoming_events
-    end
-
-    group = @upcoming_events_result.original_hash.dig("data", "groupByUrlname")
-
-    city = group.dig("city")
-    state = group.dig("state")
-    country = group.dig("country")
-
-    country = ISO3166::Country.new(country)
-
-    if country.alpha2 == "US"
-      "#{city}, #{state.upcase}"
-    else
-      "#{city}, #{country&.iso_short_name}"
-    end
-  end
-
   def upcoming_events
     result = MeetupClient::Client.query(EventsQuery, variables: { groupId: id })
 
@@ -142,41 +129,55 @@ def existing_event_ids
   end
 
   def openstruct_to_yaml(event)
-    city = event.venue.dig("city")
-    state = event.venue.dig("state")
-    country = event.venue.dig("country")
-
-    country = ISO3166::Country.new(country)
-
-    if event.isOnline
-      meetup_location = "Online"
-    elsif country.alpha2 == "US"
-      meetup_location = "#{city}, #{state.upcase}"
-    elsif country
-      meetup_location = "#{city}, #{country&.iso_short_name}"
-    else
-      meetup_location = location
-    end
-
     timezone = TZInfo::Timezone.get(event.timezone).now.strftime("%Z")
 
     <<~YAML
-      - name: "#{name} - #{event.title.gsub(name, "").squeeze(" ").strip}"
-        location: "#{meetup_location}"
+      - name: "#{event_title(event)}"
+        location: "#{event_to_location(event)}"
         date: #{Date.parse(event.dateTime).iso8601}
         start_time: "#{Time.parse(event.dateTime).strftime("%H:%M:%S")} #{timezone}"
         end_time: "#{Time.parse(event.endTime).strftime("%H:%M:%S")} #{timezone}"
         url: "#{event.eventUrl}"
     YAML
   end
 
-  def write_new_meetups!
-    new_events.each do |event|
-      next unless Date.parse(event.dateTime).between?(Date.today - 1, Date.today + 90)
+  def openstruct_to_md(event)
+    <<~MD
+      | [#{event_title(event)}](#{event.eventUrl}) | #{Date.parse(event.dateTime).strftime("%b %d, %Y")} | [#{name}](https://www.meetup.com/#{id}) |
+    MD
+  end
 
+  def write_new_meetups!
+    new_events.sort_by(&:dateTime).select { |event| Date.parse(event.dateTime).between?(Date.today - 1, Date.today + 90) }.each do |event|
       File.write("./_data/meetups.yml", openstruct_to_yaml(event), mode: "a+")
     end
   end
+
+  private
+
+    def event_title(event)
+      "#{name} - #{event.title.gsub(name, "").squeeze(" ").strip}"
+    end
+
+    def event_to_location(event)
+      city = event.venue.dig("city") || event.group.dig("city")
+      state = event.venue.dig("state") || event.group.dig("state")
+      country_raw = event.venue.dig("country") || event.group.dig("country")
+
+      country = ISO3166::Country.new(country_raw)
+
+      if event.isOnline
+        "Online"
+      elsif country.alpha2 == "US"
+        "#{city}, #{state.upcase}"
+      elsif country
+        "#{city}, #{country&.iso_short_name}"
+      elsif city
+        "#{city}, #{state}, #{country_raw.upcase}"
+      else
+        "Unknown"
+      end
+    end
 end
 
 class Meetup < FrozenRecord::Base

meetup_graphql_schema.json

@@ -316,6 +316,14 @@
                 "name": "Boolean"
               },
               "args": []
+            },
+            {
+              "name": "group",
+              "type": {
+                "kind": "OBJECT",
+                "name": "Group"
+              },
+              "args": []
             }
           ]
         },