bugfix sleeper_draft() pick number

DESCRIPTION

@@ -1,7 +1,7 @@
 Type: Package
 Package: ffscrapr
 Title: API Client for Fantasy Football League Platforms
-Version: 1.4.8.10
+Version: 1.4.8.11
 Authors@R: 
     c(person(given = "Tan",
              family = "Ho",

NEWS.md

@@ -19,6 +19,7 @@ and keep NA data where a player is not in a slot.  (v1.4.8.07)
 (v1.4.8.10)
 - Use rlang::ns_env rather than superassign in onLoad
 - Refactor testing
+- Bugfix sleeper draft picks using the wrong pick number (v1.4.8.11)
 
 # ffscrapr 1.4.8
 

R/sleeper_draft.R

@@ -50,6 +50,33 @@ ff_draft.sleeper_conn <- function(conn, ...) {
   return(df_drafts)
 }
 
+.sleeper_currentdraft <- function(draft_id) {
+  picks <- glue::glue("draft/{draft_id}/picks") %>%
+    sleeper_getendpoint() %>%
+    purrr::pluck("content") %>%
+    tibble::tibble() %>%
+    tidyr::hoist(1, "round","pick_no", "draft_slot", "roster_id", "player_id", "metadata") %>%
+    tidyr::hoist("metadata", "auction_amount" = "amount") %>%
+    dplyr::mutate(
+      auction_amount = if(all(is.na(.data$auction_amount))) NULL else as.numeric(.data$auction_amount),
+      roster_id = ifelse(is.na(.data$draft_slot), .data$roster_id, .data$draft_slot)
+    ) %>%
+    dplyr::select(
+      dplyr::any_of(
+        c(
+          "round",
+          "pick" = "pick_no",
+          "franchise_id" = "roster_id",
+          "player_id",
+          "auction_amount"
+        )
+      )
+    )
+
+  return(picks)
+}
+
+
 #' Get Sleeper Draft
 #'
 #' This function retrieves drafts by sleeper's draft ID. This better supports
@@ -70,7 +97,7 @@ sleeper_draft <- function(draft_id){
     dplyr::select("player_id", "player_name", "pos", "team", "age")
 
   franchise_endpoint <- data.frame(
-    franchise_id = character()
+    franchise_id = integer()
   )
 
   if(!is.null(draft_endpoint$content$league_id)){

R/sleeper_draftpicks.R

@@ -61,25 +61,6 @@ ff_draftpicks.sleeper_conn <- function(conn, ...) {
   return(current_drafts)
 }
 
-.sleeper_currentdraft <- function(draft_id) {
-  picks <- glue::glue("draft/{draft_id}/picks") %>%
-    sleeper_getendpoint() %>%
-    purrr::pluck("content") %>%
-    purrr::map(`[`, c("round", "draft_slot", "roster_id", "player_id", "metadata")) %>%
-    tibble::tibble() %>%
-    tidyr::unnest_wider(1) %>%
-    tidyr::hoist("metadata", "auction_amount" = "amount") %>%
-    dplyr::select(dplyr::any_of(c("round", "pick" = "draft_slot", "franchise_id" = "roster_id", "player_id", "auction_amount")))
-
-  if (all(is.na(picks$auction_amount))) {
-    picks$auction_amount <- NULL
-  } else {
-    picks$auction_amount <- as.numeric(picks$auction_amount)
-  }
-
-  return(picks)
-}
-
 .sleeper_futurepicks <- function(conn, include_current = FALSE) {
   league_settings <- glue::glue("league/{conn$league_id}") %>%
     sleeper_getendpoint() %>%