removed use of .data and moved post creation to bottom

Author: lwjohnst86

scripts/announcements.R

@@ -75,65 +75,26 @@ coffee_code_details <-
 
 # Find any existing posts, take the date, and filter out those sessions from the
 # session_details dataframe.
-keep_only_new <- function(.data) {
+keep_only_new <- function(events) {
     existing_post_dates <- fs::dir_ls(here::here("_posts"), regexp = ".md$|.markdown$") %>%
         str_extract("[0-9]{4}-[0-9]{2}-[0-9]{2}")
 
-    .data %>%
+    events %>%
         filter(!as.character(date) %in% existing_post_dates)
 }
 
 new_sessions <- keep_only_new(session_details)
 new_coffee_code <- keep_only_new(coffee_code_details)
 
-# Create files in _posts/ -------------------------------------------------
-# Adds the new sessions/events to the _posts folder.
+# Create a GitHub Issue of the session ------------------------------------
 
 # Format as eg August 23
-day_month <- function(.date, add_name = TRUE) {
+day_month <- function(date_var, add_name = TRUE) {
     date_format <- "%B %e" # as August 23
     if (add_name) date_format <- "%A, %B %e" # as Monday, August 23
-    trimws(format(as.Date(.date), format = date_format))
+    trimws(format(as.Date(date_var), format = date_format))
 }
 
-create_new_posts_with_content <- function(.data) {
-    new_post_filenames <-
-        glue_data(.data, "{here::here('_posts')}/{date}-{key}.md")
-
-    # Get the GitHub Issue URL for the event.
-    gh_issue_number <- gh::gh("GET /repos/:owner/:repo/issues",
-                              owner = "uoftcoders",
-                              repo = "Events") %>%
-        map_dfr(~ data_frame(by_title = .$title, url = .$html_url))
-
-    new_post_content <- .data %>%
-        mutate(by_title = str_c(title, " - ", day_month(date, add_name = FALSE))) %>%
-        left_join(gh_issue_number, by = "by_title") %>%
-        glue_data(
-            '
-            ---
-            title: "{title}"
-            text: "{description}"
-            location: "{location}"
-            link: "{url}"
-            date: "{as.Date(date)}"
-            startTime: "{start_time}"
-            endTime: "{end_time}"
-            ---
-            '
-        )
-
-    # Save post content to file
-    fs::dir_create(here::here("_posts"))
-    map2(new_post_content, new_post_filenames, ~ write_lines(x = .x, path = .y))
-    usethis:::done("Markdown posts created in _posts/ folder.")
-    return(invisible())
-}
-
-create_new_posts_with_content(new_sessions)
-create_new_posts_with_content(new_coffee_code)
-
-# Create a GitHub Issue of the session ------------------------------------
 
 post_gh_issue <- function(title, body, labels) {
     # Will need to set up a GitHub PAT via (I think) the function
@@ -156,8 +117,8 @@ post_gh_issue <- function(title, body, labels) {
     }
 }
 
-gh_issue_info_event <- function(.data) {
-    content <- .data %>%
+gh_issue_info_event <- function(events) {
+    content <- events %>%
         mutate(needs_packages = ifelse(
             !is.na(packages),
             str_c(
@@ -183,13 +144,13 @@ gh_issue_info_event <- function(.data) {
             "
         )
 
-    .data %>%
+    events %>%
         mutate(content = content, title = str_c(title, " - ", day_month(date, add_name = FALSE))) %>%
         select(title, content, skill_level, gh_labels)
 }
 
-gh_issue_info_coffee_code <- function(.data) {
-    content <- .data %>%
+gh_issue_info_coffee_code <- function(events) {
+    content <- events %>%
         glue_data(
             "
             Our bi-weekly 'Coffee and Code' meet-up:
@@ -206,22 +167,62 @@ gh_issue_info_coffee_code <- function(.data) {
             "
         )
 
-    .data %>%
+    events %>%
         mutate(content = content, title = str_c(title, " - ", day_month(date, add_name = FALSE))) %>%
         select(title, content, gh_labels)
 }
 
-create_gh_issues_coffee_code <- function(.data) {
-    .data %>%
+create_gh_issues_coffee_code <- function(events) {
+    events %>%
         gh_issue_info_coffee_code() %>%
         pmap( ~ post_gh_issue(..1, ..2, ..3))
 }
 
-create_gh_issues_events <- function(.data) {
-    .data %>%
+create_gh_issues_events <- function(events) {
+    events %>%
         gh_issue_info_event() %>%
         pmap( ~ post_gh_issue(..1, ..2, c(..3, ..4)))
 }
 
 create_gh_issues_coffee_code(new_coffee_code)
 create_gh_issues_events(new_sessions)
+
+# Create files in _posts/ -------------------------------------------------
+# Adds the new sessions/events to the _posts folder.
+
+create_new_posts_with_content <- function(events) {
+    new_post_filenames <-
+        glue_data(events, "{here::here('_posts')}/{date}-{key}.md")
+
+    # Get the GitHub Issue URL for the event.
+    gh_issue_number <- gh::gh("GET /repos/:owner/:repo/issues",
+                              owner = "uoftcoders",
+                              repo = "Events") %>%
+        map_dfr(~ data_frame(by_title = .x$title, url = .x$html_url))
+
+    new_post_content <- events %>%
+        mutate(by_title = str_c(title, " - ", day_month(date, add_name = FALSE))) %>%
+        left_join(gh_issue_number, by = "by_title") %>%
+        glue_data(
+            '
+            ---
+            title: "{title}"
+            text: "{description}"
+            location: "{location}"
+            link: "{url}"
+            date: "{as.Date(date)}"
+            startTime: "{start_time}"
+            endTime: "{end_time}"
+            ---
+            '
+        )
+
+    # Save post content to file
+    fs::dir_create(here::here("_posts"))
+    map2(new_post_content, new_post_filenames, ~ write_lines(x = .x, path = .y))
+    usethis:::done("Markdown posts created in _posts/ folder.")
+    return(invisible())
+}
+
+create_new_posts_with_content(new_sessions)
+create_new_posts_with_content(new_coffee_code)