diff --git a/.gitignore b/.gitignore index b1cfe65..b1eb13b 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ docs/ docs inst/doc +.DS_Store diff --git a/DESCRIPTION b/DESCRIPTION index fea8399..7b77822 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: fflr Title: Retrieve ESPN Fantasy Football Data -Version: 2.2.0.9001 +Version: 2.2.0.9002 Authors@R: person("Kiernan", "Nicholls", , "kiernann@protonmail.com", role = c("aut", "cre", "cph")) Description: Format the raw data from the ESPN fantasy football API diff --git a/NEWS.md b/NEWS.md index bc55593..326c5aa 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,5 +1,11 @@ # fflr (development version) +* The functions `league_members()` and `league_teams()` have been adjusted to + add new columns. The order of columns has also been rearranged to focus on + the output of each function (all teams or all members), since some teams can + have multiple owners or multiple teams can have the same owner. + * Add `firstName` and `lastName` to `league_members()` + * Add `logo` and `logoType` to `league_teams()` * Use latest package dependencies. # fflr 2.2.0 diff --git a/R/members.R b/R/members.R index 03e0676..3150ea1 100644 --- a/R/members.R +++ b/R/members.R @@ -12,6 +12,7 @@ league_members <- function(leagueId = ffl_id(), leagueHistory = FALSE, ...) { dat <- ffl_api( leagueId = leagueId, leagueHistory = leagueHistory, + view = "mNav", ... ) if (leagueHistory && is.list(dat$teams)) { @@ -23,6 +24,8 @@ league_members <- function(leagueId = ffl_id(), leagueHistory = FALSE, ...) { } out_member <- function(x) { + x <- x[, c("id", "displayName", "firstName", "lastName", + "isLeagueCreator", "isLeagueManager")] x <- change_names(x, "id", "memberId") as_tibble(x) } diff --git a/R/teams.R b/R/teams.R index 6cbbba0..0de3c62 100644 --- a/R/teams.R +++ b/R/teams.R @@ -15,6 +15,7 @@ league_teams <- function(leagueId = ffl_id(), leagueHistory = FALSE, ...) { dat <- ffl_api( leagueId = leagueId, leagueHistory = leagueHistory, + view = "mNav", ... ) if (leagueHistory && is.list(dat$teams)) { @@ -26,6 +27,9 @@ league_teams <- function(leagueId = ffl_id(), leagueHistory = FALSE, ...) { } out_team <- function(z, trim = FALSE) { + if ("logoType" %in% names(z)) { + z <- z[, c("id", "abbrev", "name", "logo", "logoType", "owners")] + } z <- change_names(z, "id", "teamId") z <- change_names(z, "owners", "memberId") z$abbrev <- factor(z$teamId, labels = z$abbrev) diff --git a/tests/testthat/test-members.R b/tests/testthat/test-members.R index 797151b..942db2a 100644 --- a/tests/testthat/test-members.R +++ b/tests/testthat/test-members.R @@ -1,7 +1,7 @@ test_that("league members", { m <- league_members(leagueId = "42654852") expect_s3_class(m, "data.frame") - expect_length(m, 3) + expect_length(m, 6) }) test_that("league members history with names", { @@ -9,5 +9,5 @@ test_that("league members history with names", { expect_type(m, "list") expect_named(m) expect_s3_class(m[[1]], "data.frame") - expect_length(m[[1]], 3) + expect_length(m[[1]], 6) })