From ee41f5908be1a4368dddb7b29642a3b7423a0b48 Mon Sep 17 00:00:00 2001 From: Sam Abbott Date: Sat, 5 Feb 2022 16:16:35 +0000 Subject: [PATCH] use dplyr group_vars --- NAMESPACE | 1 + R/processing.R | 6 ++---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/NAMESPACE b/NAMESPACE index 35d1f272..7c85cb04 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -61,6 +61,7 @@ importFrom(dplyr,filter) importFrom(dplyr,full_join) importFrom(dplyr,group_by) importFrom(dplyr,group_by_at) +importFrom(dplyr,group_vars) importFrom(dplyr,if_else) importFrom(dplyr,lag) importFrom(dplyr,last_col) diff --git a/R/processing.R b/R/processing.R index 7c77c2c9..914910a2 100644 --- a/R/processing.R +++ b/R/processing.R @@ -51,15 +51,13 @@ set_negative_values_to_zero <- function(data) { #' @family compulsory_processing #' @concept compulsory_processing #' @importFrom tidyr complete full_seq nesting -#' @importFrom dplyr starts_with group_by ungroup +#' @importFrom dplyr starts_with group_by ungroup group_vars #' @importFrom rlang !!! syms fill_empty_dates_with_na <- function(data) { regions <- select(data, starts_with("level_")) %>% names() - groups <- attributes(data)$groups - groups <- colnames(groups) - groups <- setdiff(groups, ".rows") + groups <- group_vars(data) data <- data %>% ungroup() %>%