Merge pull request #36 from CorrelAid/dev

fix bug (issue #35)

R/gen_api.R

@@ -14,12 +14,42 @@
 #'   httr2::resp_body_json()
 #' }
 #'
+# gen_api <- function(endpoint, ...) {
+#
+#   httr2::request("https://www-genesis.destatis.de/genesisWS/rest/2020") %>%
+#     httr2::req_user_agent("https://github.com/CorrelAid/restatis") %>%
+#     httr2::req_url_path_append(endpoint) %>%
+#     httr2::req_url_query(!!!gen_auth_get(database = "genesis"), ...) %>%
+#     httr2::req_retry(max_tries = 3) %>%
+#     httr2::req_perform()
+#
+# }
+
 gen_api <- function(endpoint, ...) {
 
-  httr2::request("https://www-genesis.destatis.de/genesisWS/rest/2020") %>%
-    httr2::req_user_agent("https://github.com/CorrelAid/restatis") %>%
+  url <- "https://www-genesis.destatis.de/genesisWS/rest/2020"
+  user_agent <- "https://github.com/CorrelAid/restatis"
+
+  body_parameters <- list(...)
+
+  if (length(body_parameters) > 0) {
+
+    req <- httr2::request(url) %>%
+      httr2::req_body_form(!!!body_parameters)
+
+  } else {
+
+    req <- httr2::request(url) %>%
+      httr2::req_body_form(!!!list("foo" = "bar"))
+
+  }
+
+  req %>%
+    httr2::req_user_agent(user_agent) %>%
     httr2::req_url_path_append(endpoint) %>%
-    httr2::req_url_query(!!!gen_auth_get(database = "genesis"), ...) %>%
+    httr2::req_headers("Content-Type" = "application/x-www-form-urlencoded",
+                       "username" = gen_auth_get(database = "genesis")$username,
+                       "password" = gen_auth_get(database = "genesis")$password) %>%
     httr2::req_retry(max_tries = 3) %>%
     httr2::req_perform()
 

R/gen_table.R

@@ -78,6 +78,13 @@ gen_table_ <- function(name,
   #-----------------------------------------------------------------------------
   # Parameter processing
 
+  if (missing(database)) {
+
+    stop("It is mandatory to specifiy the 'database' parameter for 'gen_table()'.",
+         call. = FALSE)
+
+  }
+
   database <- match.arg(database)
 
   area <- match.arg(area)
@@ -103,7 +110,7 @@ gen_table_ <- function(name,
   #-----------------------------------------------------------------------------
   # Data download
 
-  if(database == "zensus"){
+  if (database == "zensus"){
 
     response <- gen_zensus_api("data/tablefile",
                                name = name,

R/utils_httr2.R

@@ -276,21 +276,29 @@ return_table_object <- function(response,
                               "Consider making a range of smaller requests or use the \n",
                               "option to create a job by setting the 'job' parameter \n",
                               "of 'gen_table()' to TRUE. You can then download the job \n",
-                              "later (use the function 'gen_list_jobs()' to check its status).")
+                              "later (use the function 'gen_list_jobs()' to check its status) \n",
+                              "and download it using gen_download_job().")
 
       stop(error_message, call. = FALSE)
 
     } else if (response_parsed$Status$Code == 99) {
 
-      message <- paste0("You have requested successfully created a job with \n",
+      message <- paste0("You have successfully created a job with \n",
                         "your request. Use the function 'gen_list_jobs()' ",
                         "to check its status and download it once completed.")
 
       message(message)
 
+    } else if (response_parsed$Status$Code == 104) {
+
+      stop("There are no results for your request. Please check if the requested table code is valid for the database selected.",
+           call. = FALSE)
+
     } else {
 
-      stop("There has been an error with your request (not parseable response type 'application/json').\n Please try again later or contact the package maintainer.",
+      stop(paste0("There has been an error with your request (API error code: '",
+                  response_parsed$Status$Code,
+                  "').\n Please try again later or contact the package maintainer."),
            call. = FALSE)
 
     }

README.Rmd

@@ -72,7 +72,7 @@ In a short overview, there are functions divided in two main parts, searching fo
 
 #### Other functions
 - **gen_logincheck()**: Perform a logincheck to test your credentials
-- **gen_qualitysigns()**: Get a list of quality signs (special characters) found in the API's tables
+- **gen_signs()**: Get a list of quality signs (special characters) found in the API's tables
 - **gen_update_evas()**: Manually scrape a newer version of the EVAS numbers (official statistic IDs)
 
 ### Caching