Merge pull request #47 from Public-Health-Scotland/edit-httr-retry

don't retry on 409 status
Public-Health-Scotland · Nov 19, 2024 · 759e371 · 759e371
2 parents 3898526 + d8a4263
commit 759e371
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/R/phs_GET.R b/R/phs_GET.R
@@ -11,8 +11,9 @@ phs_GET <- function(action, query, verbose = FALSE) {
   response <- httr::RETRY(
     verb = "GET",
     url = url,
+    terminate_on = c(409),
     user_agent = httr::user_agent(
-      "https://github.com/Public-Health-Scotland/phsmethods"
+      "phsopendata (https://github.com/Public-Health-Scotland/phsopendata)"
     )
   )
 

diff --git a/tests/testthat/test-get_dataset.R b/tests/testthat/test-get_dataset.R
@@ -44,3 +44,9 @@ test_that("get_dataset errors properly", {
     regexp = "Did you mean .+?gp-practice-populations.+?\\?"
   )
 })
+
+test_that("get_dataset filters error properly", {
+  expect_error(get_dataset("gp-practice-populations", col_select = "Non-existent column"),
+    regexp = "API error"
+  )
+})