Merge pull request #133 from molgenis/fix/subset

fix: subset

NAMESPACE

@@ -56,6 +56,7 @@ importFrom(purrr,map_lgl)
 importFrom(purrr,pmap)
 importFrom(purrr,walk)
 importFrom(readr,read_csv)
+importFrom(stringr,str_ends)
 importFrom(stringr,str_replace)
 importFrom(tibble,tibble)
 importFrom(tidyr,nest)

R/subset.R

@@ -304,7 +304,23 @@ armadillo.subset_definition <- function(reference_csv = NULL, vars = NULL) { # n
 #' @param target_project Project to upload subset to.
 #' @noRd
 .make_post_url <- function(target_project) {
-  return(sprintf("%sstorage/projects/%s/objects/link", .get_url(), target_project))
+  server_url <- .add_slash_if_missing(.get_url())
+  return(sprintf("%sstorage/projects/%s/objects/link", server_url, target_project))
+}
+
+#' Add a Slash to a URL if Missing
+#'
+#' This function ensures that a given URL string ends with a slash ('/'). 
+#' If the URL does not end with a slash, it appends one.
+#'
+#' @param url A character string representing the URL.
+#' @return A character string with a trailing slash if it was missing.
+#' @importFrom stringr str_ends
+.add_slash_if_missing <- function(url) {
+  if(!str_ends(url, "/")) {
+    url <- paste0(url, "/")
+  }
+  return(url)
 }
 
 #' Creates JSON body for the API request

tests/testthat/test-subset.R

@@ -533,3 +533,16 @@ test_that("armadillo.subset fails if subset_def is NULL", {
     fixed = TRUE
   )
 })
+
+test_that(".add_slash_if_missing adds a slash to the end of the URL if not present", {
+  expect_equal(
+    .add_slash_if_missing("https://armadillo-demo.molgenis.net"), 
+    "https://armadillo-demo.molgenis.net/"
+  )
+
+  expect_equal(
+    .add_slash_if_missing("https://armadillo-demo.molgenis.net/"), 
+    "https://armadillo-demo.molgenis.net/"
+  )
+
+})