Fix issues caused by new dplyr

OHDSI · Nov 6, 2023 · f5bf4ca · f5bf4ca
1 parent 19ae189
commit f5bf4ca
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/R/StudyPopulation.R b/R/StudyPopulation.R
@@ -230,14 +230,14 @@ createStudyPopulation <- function(cohortMethodData,
             .data$daysToEvent > -priorOutcomeLookback &
               outcomes$daysToEvent < outcomes$daysToCohortEnd + riskWindowStart
           ) %>%
-          select("rowId")
+          pull("rowId")
       } else {
         priorOutcomeRowIds <- outcomes %>%
           filter(
             .data$daysToEvent > -priorOutcomeLookback &
               .data$daysToEvent < riskWindowStart
           ) %>%
-          select("rowId")
+          pull("rowId")
       }
       population <- population %>%
         filter(!(.data$rowId %in% priorOutcomeRowIds))

diff --git a/tests/testthat/test-parameterSweep.R b/tests/testthat/test-parameterSweep.R
@@ -55,7 +55,10 @@ test_that("Create study population functions", {
     minDaysAtRisk = 1
   )
   expect_true(all(studyPop$timeAtRisk > 0))
-  peopleWithPriorOutcomes <- cohortMethodData$outcomes$rowId[cohortMethodData$outcomes$daysToEvent < 0]
+  peopleWithPriorOutcomes <- cohortMethodData$outcomes %>%
+    filter(outcomeId == 194133 & daysToEvent < 0) %>%
+    distinct(rowId) %>%
+    pull()
   expect_false(any(peopleWithPriorOutcomes %in% studyPop$rowId))
 
   aTable <- getAttritionTable(studyPop)

diff --git a/tests/testthat/testthat-problems.rds b/tests/testthat/testthat-problems.rds