Merge pull request #4 from ices-tools-dev/hotfix

remove icesASD from packages an bump version number
ices-tools-dev · Mar 7, 2024 · 5f8d364 · 5f8d364
2 parents effad89 + 3f83121
commit 5f8d364
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 151 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: icesTEASD
 Title: An Amazing Shiny App
-Version: 0.0.0.9005
+Version: 0.0.0.9006
 Authors@R:
     c(person("Neil", "Maginnis", role=c("aut","cre"), email="neil.maginnis@ices.dk"),
       person("Colin", "Millar", role="aut"))
@@ -17,7 +17,6 @@ Imports:
     magrittr,
     shiny (>= 1.8.0),
     icesSAG,
-    icesASD,
     dplyr,
     desc,
     jsonlite,

diff --git a/NAMESPACE b/NAMESPACE
@@ -33,7 +33,6 @@ importFrom(golem,with_golem_options)
 importFrom(htmltools,css)
 importFrom(htmltools,h1)
 importFrom(htmltools,tags)
-importFrom(icesASD,getAdviceViewRecord)
 importFrom(icesSAG,getListStocks)
 importFrom(jsonlite,fromJSON)
 importFrom(lubridate,month)

diff --git a/R/fct_check_db_errors.R b/R/fct_check_db_errors.R
@@ -8,7 +8,6 @@
 #' @noRd
 #'
 #' @importFrom icesSAG getListStocks
-#' @importFrom icesASD getAdviceViewRecord
 #' @importFrom dplyr filter select mutate bind_rows left_join
 #' @importFrom magrittr %>%
 #' @importFrom shiny validate need
@@ -17,6 +16,8 @@
 check_stock_db_errors <- function(year) {
 
 
+  SAG_data <- getListStocks(year = year)
+
   url <- paste0(
     "http://sd.ices.dk/services/odata4/StockListDWs4?$filter=ActiveYear%20eq%20",
     year
@@ -25,8 +26,15 @@ check_stock_db_errors <- function(year) {
   out <- fromJSON(url, simplifyDataFrame = TRUE)$value
 
   SID_data <- unique(out)
-  SAG_data <- getListStocks(year = year)
-  ASD_data <- getAdviceViewRecord(year = year)
+
+  url <- paste0(
+    "https://asd.ices.dk/api/getAdviceViewRecord?Year=",
+    year
+  )
+
+  out <- fromJSON(url, simplifyDataFrame = TRUE)
+
+  ASD_data <- unique(out)
 
   validate(
     need(!is.null(SID_data), "SID not responding correctly"),

diff --git a/renv.lock b/renv.lock
@@ -65,16 +65,6 @@
       ],
       "Hash": "cad6cf7f1d5f6e906700b9d3e718c796"
     },
-    "assertthat": {
-      "Package": "assertthat",
-      "Version": "0.2.1",
-      "Source": "Repository",
-      "Repository": "CRAN",
-      "Requirements": [
-        "tools"
-      ],
-      "Hash": "50c838a310445e954bc13f26f26a6ecf"
-    },
     "attempt": {
       "Package": "attempt",
       "Version": "0.3.1",
@@ -315,16 +305,6 @@
       "Repository": "CRAN",
       "Hash": "f7736a18de97dea803bde0a2daaafb27"
     },
-    "filelock": {
-      "Package": "filelock",
-      "Version": "1.0.3",
-      "Source": "Repository",
-      "Repository": "CRAN",
-      "Requirements": [
-        "R"
-      ],
-      "Hash": "192053c276525c8495ccfd523aa8f2d1"
-    },
     "fontawesome": {
       "Package": "fontawesome",
       "Version": "0.5.2",
@@ -359,18 +339,6 @@
       ],
       "Hash": "15e9634c0fcd294799e9b2e929ed1b86"
     },
-    "getPass": {
-      "Package": "getPass",
-      "Version": "0.2-4",
-      "Source": "Repository",
-      "Repository": "CRAN",
-      "Requirements": [
-        "R",
-        "rstudioapi",
-        "utils"
-      ],
-      "Hash": "281e56bcab06202f51be7b50254f2fce"
-    },
     "glue": {
       "Package": "glue",
       "Version": "1.6.2",
@@ -483,35 +451,6 @@
       ],
       "Hash": "ac107251d9d9fd72f0ca8049988f1d7f"
     },
-    "icesASD": {
-      "Package": "icesASD",
-      "Version": "0.0.1",
-      "Source": "Repository",
-      "Repository": "https://ices-tools-prod.r-universe.dev",
-      "Requirements": [
-        "glue",
-        "httr",
-        "icesConnect",
-        "jsonlite",
-        "tidyr"
-      ],
-      "Hash": "77c9a5f8b77ff5ecc7f00e191d56a18b"
-    },
-    "icesConnect": {
-      "Package": "icesConnect",
-      "Version": "1.0.0",
-      "Source": "Repository",
-      "Repository": "https://ices-tools-prod.r-universe.dev",
-      "Requirements": [
-        "base64enc",
-        "getPass",
-        "httr",
-        "jsonlite",
-        "keyring",
-        "whoami"
-      ],
-      "Hash": "05754e66f054adbfb7c4f03215b8238c"
-    },
     "icesSAG": {
       "Package": "icesSAG",
       "Version": "1.4.1",
@@ -558,26 +497,6 @@
       ],
       "Hash": "e1b9c55281c5adc4dd113652d9e26768"
     },
-    "keyring": {
-      "Package": "keyring",
-      "Version": "1.3.2",
-      "Source": "Repository",
-      "Repository": "CRAN",
-      "Requirements": [
-        "R",
-        "R6",
-        "askpass",
-        "assertthat",
-        "filelock",
-        "openssl",
-        "rappdirs",
-        "sodium",
-        "tools",
-        "utils",
-        "yaml"
-      ],
-      "Hash": "5cd8cfb2e90c57110b7dd1785c599aba"
-    },
     "knitr": {
       "Package": "knitr",
       "Version": "1.45",
@@ -795,21 +714,6 @@
       ],
       "Hash": "709d852d33178db54b17c722e5b1e594"
     },
-    "purrr": {
-      "Package": "purrr",
-      "Version": "1.0.2",
-      "Source": "Repository",
-      "Repository": "CRAN",
-      "Requirements": [
-        "R",
-        "cli",
-        "lifecycle",
-        "magrittr",
-        "rlang",
-        "vctrs"
-      ],
-      "Hash": "1cba04a4e9414bdefc9dcaa99649a8dc"
-    },
     "rappdirs": {
       "Package": "rappdirs",
       "Version": "0.3.3",
@@ -875,13 +779,6 @@
       ],
       "Hash": "4c8415e0ec1e29f3f4f6fc108bef0144"
     },
-    "rstudioapi": {
-      "Package": "rstudioapi",
-      "Version": "0.15.0",
-      "Source": "Repository",
-      "Repository": "CRAN",
-      "Hash": "5564500e25cffad9e22244ced1379887"
-    },
     "sass": {
       "Package": "sass",
       "Version": "0.4.7",
@@ -930,13 +827,6 @@
       ],
       "Hash": "3a1f41807d648a908e3c7f0334bf85e6"
     },
-    "sodium": {
-      "Package": "sodium",
-      "Version": "1.3.1",
-      "Source": "Repository",
-      "Repository": "CRAN",
-      "Hash": "dd86d6fd2a01d4eb3777dfdee7076d56"
-    },
     "sourcetools": {
       "Package": "sourcetools",
       "Version": "0.1.7-1",
@@ -1003,29 +893,6 @@
       ],
       "Hash": "a84e2cc86d07289b3b6f5069df7a004c"
     },
-    "tidyr": {
-      "Package": "tidyr",
-      "Version": "1.3.0",
-      "Source": "Repository",
-      "Repository": "CRAN",
-      "Requirements": [
-        "R",
-        "cli",
-        "cpp11",
-        "dplyr",
-        "glue",
-        "lifecycle",
-        "magrittr",
-        "purrr",
-        "rlang",
-        "stringr",
-        "tibble",
-        "tidyselect",
-        "utils",
-        "vctrs"
-      ],
-      "Hash": "e47debdc7ce599b070c8e78e8ac0cfcf"
-    },
     "tidyselect": {
       "Package": "tidyselect",
       "Version": "1.2.0",
@@ -1087,18 +954,6 @@
       ],
       "Hash": "c03fa420630029418f7e6da3667aac4a"
     },
-    "whoami": {
-      "Package": "whoami",
-      "Version": "1.3.0",
-      "Source": "Repository",
-      "Repository": "CRAN",
-      "Requirements": [
-        "httr",
-        "jsonlite",
-        "utils"
-      ],
-      "Hash": "ef0f4d9b8f2cc2ebeccae1d725b8a023"
-    },
     "withr": {
       "Package": "withr",
       "Version": "2.5.2",