Move the stop for a clearer error #142

The stop located within get_json() was not fully stopping the function leading to a confusing error about a missing column when there was actually no data in the data warehouse for a particular species.  Moving this here stops the function correctly.

R/get_json.R

@@ -20,13 +20,5 @@ get_json <- function(url) {
     httr::content(as = "text", encoding = "UTF-8") |>
     jsonlite::fromJSON()
 
-  if (!(is.data.frame(out) && NROW(out) > 0)) {
-    stop(glue::glue(
-      "\n No data returned by the warehouse for the filters given.
-      \n Make sure the year range is correct (cannot include -Inf or Inf) for the project selected and the input name is correct,
-      \n otherwise there may be no data for this species from this project.\n
-      URL: {url}"
-    ))
-  }
   return(out)
 }

R/pull_bio.R

@@ -124,6 +124,15 @@ pull_bio <- function(
   }
   bio_pull <- try(get_json(url = url_text))
 
+  if (!(is.data.frame(bio_pull))) {
+    stop(glue::glue(
+      "\n No data returned by the warehouse for the filters given.
+      \n Make sure the year range is correct (cannot include -Inf or Inf) for the project selected and the input name is correct,
+      \n otherwise there may be no data for this species from this project.\n
+      URL: {url_text}"
+    ))
+  }
+
   if (!is.data.frame(bio_pull) & !survey %in% c("Triennial", "AFSC.Slope")) {
     stop(cat("\nNo data returned by the warehouse for the filters given.
             Make sure the year range is correct for the project selected and the input name is correct,