Merge pull request #45 from nhs-r-community/fix-errors

Fix errors

.gitignore

@@ -6,3 +6,4 @@
 inst/doc
 docs
 archive/
+httr2-test/

NHSRpopulation.Rproj

@@ -0,0 +1,19 @@
+Version: 1.0
+
+RestoreWorkspace: Default
+SaveWorkspace: Default
+AlwaysSaveHistory: Default
+
+EnableCodeIndexing: Yes
+UseSpacesForTab: Yes
+NumSpacesForTab: 2
+Encoding: UTF-8
+
+RnwWeave: Sweave
+LaTeX: pdfLaTeX
+
+StripTrailingWhitespace: Yes
+
+BuildType: Package
+PackageUseDevtools: Yes
+PackageInstallArgs: --no-multiarch --with-keep.source

R/get_data.R

@@ -38,6 +38,9 @@ get_data <- function(data,
   value <- NULL
   lsoa11cd <- NULL
   lsoa_code <- NULL
+  imd_decile <- NULL
+  imd_rank <- NULL
+  imd_score <- NULL
 
   # Check there is corresponding type data somewhere in data frame
   # Use this to allow for other column names to be used in later code
@@ -71,15 +74,15 @@ get_data <- function(data,
   ## Generate specific text for the url
 
   if (is.atomic(data) && is_postcode_check == 0 &&
-        is_lsoa_check > 0) {
+    is_lsoa_check > 0) {
     text <- paste0(
       "LSOA11CD IN ('",
       paste(data,
         collapse = "', '"
       ), "')"
     )
   } else if (is.data.frame(data) && is_postcode_check == 0 &&
-               is_lsoa_check > 0) {
+    is_lsoa_check > 0) {
     text <- paste0(
       "LSOA11CD IN ('",
       paste(data[[column]],
@@ -113,7 +116,7 @@ get_data <- function(data,
   ## IMD data
 
   if (is_postcode_check == 0 && is_lsoa_check > 0 &&
-        is.data.frame(data)) {
+    is.data.frame(data)) {
     data_out <- imd_api(
       text = text,
       req = req
@@ -150,6 +153,13 @@ get_data <- function(data,
       dplyr::left_join(
         data_out,
         dplyr::join_by(lsoa_code == lsoa11cd)
+      ) |>
+      dplyr::select(
+        1:3,
+        imd_decile,
+        imd_rank,
+        imd_score,
+        dplyr::everything()
       )
   } else if (exists("pc_data") && url_type == "postcode") {
     pc_data