Merge pull request #11 from ecohealthalliance/hotfix/sanitise

Hotfix/sanitise
ecohealthalliance · Apr 16, 2024 · 82bd908 · 82bd908
2 parents e12f39d + 760ce51
commit 82bd908
Show file tree

Hide file tree

Showing 18 changed files with 28 additions and 86 deletions.
diff --git a/R/create_translation_log.R b/R/create_translation_log.R
@@ -16,7 +16,7 @@
 #' \dontrun{
 #' create_translation_log(response_data = semi_clean_data,
 #'                        form_schema = odk_schema_data,
-#'                        url = "https://odk.eha.io/#/projects/5/forms/RVF2_animal_owner/submissions"))
+#'                        url = "https://odk.xyz.io/#/projects/project-name/submissions"))
 #' }
 #'
 create_translation_log <-

diff --git a/R/download_dropbox.R b/R/download_dropbox.R
@@ -12,8 +12,8 @@
 #' @seealso [rdrop2::drop_download()]
 #' @examples
 #' \dontrun{
-#'    download_dropbox(dropbox_path = "DTRA_RVF2/RVF Mosquito Datasets",
-#'    dropbox_filename = "Mosquito dataset as at 01-02-2024.xlsx",
+#'    download_dropbox(dropbox_path = "XYZ/Project-Datasets",
+#'    dropbox_filename = "Project dataset as at 01-02-2024.xlsx",
 #'    download_path = here::here("data"),
 #'    overwrite = TRUE)
 #' }
@@ -23,8 +23,6 @@ download_dropbox <-
            dropbox_filename,
            download_path,
            ...) {
-    # locate and update token
-    refresh_db_token()
 
     # check if exists
     if (!rdrop2::drop_exists(paste(dropbox_path, dropbox_filename, sep = "/"))) {

diff --git a/R/download_googledrive_files.R b/R/download_googledrive_files.R
@@ -18,14 +18,15 @@
 #' @examples
 #' \dontrun{
 #'   download_googledrive_files(
-#'   drive_path = "https://drive.google.com/drive/u/0/folders/144cVfY4l087qeBz0Kkd31KAb5os9tw28",
+#'   key_path = here::here("./key.json"),
+#'   drive_path = "https://drive.google.com/drive/u/0/folders/asdjfnasiffas8ef7y7y89rf",
 #'   search_pattern = "*.xlsx",
-#'   out_path = here::here("data/kzn_animal_ship/")
+#'   out_path = here::here("data/project_data/")
 #'   )
 #' }
 #'
 download_googledrive_files <-
-  function(key_path = here::here("./auth/rvf2-workflow-automation-2877f538ddb9.json"),
+  function(key_path,
            drive_path,
            search_pattern,
            MIME_type = NULL,

diff --git a/R/dropbox_refresh.R b/R/dropbox_refresh.R
diff --git a/R/dropbox_upload.R b/R/dropbox_upload.R
@@ -16,17 +16,14 @@
 #' \dontrun{
 #'     dropbox_upload(
 #'     kzn_animal_ship_semiclean,
-#'     file_path = here::here("outputs/kzn_animal_ship_semiclean.csv"),
-#'     dropbox_path = "DTRA_RVF2/Data/rvf2_github_data/semi_clean_data"
+#'     file_path = here::here("outputs/data.csv"),
+#'     dropbox_path = "XYZ/Data/semi_clean_data"
 #'     )
 #' }
 #'
 dropbox_upload <- function(log, file_path, dropbox_path) {
   log_export <- readr::write_csv(log, file_path)
 
-  # upload token
-  refresh_db_token()
-
   # upload
   rdrop2::drop_upload(file_path, dropbox_path)
 

diff --git a/R/get_dropbox_val_logs.R b/R/get_dropbox_val_logs.R
@@ -14,12 +14,11 @@
 #' @export
 #' @examples
 #' \dontrun{
-#'  get_dropbox_val_logs(file_name = "log_levellogger.csv", folder = NULL)
+#'  get_dropbox_val_logs(file_name = "log.csv", folder = NULL)
 #' }
 #'
 get_dropbox_val_logs <-
-  function(file_name, folder, path_name = "DTRA_RVF2/Data/rvf2_github_data/validation_logs") {
-    refresh_db_token()
+  function(file_name, folder, path_name) {
 
     # path handling when log isnt in a dedicated subfolder on drop box
     if (is.null(folder)) {

diff --git a/R/get_odk_form_schema.R b/R/get_odk_form_schema.R
@@ -18,7 +18,7 @@
 #' @seealso [ruODK::form_schema_ext()]
 #' @examples
 #' \dontrun{
-#'     get_odk_form_schema(url ="https://odk.eha.io/v1/projects/5/forms/RVF2_animal_owner.svc",
+#'     get_odk_form_schema(url ="https://odk.xyz.io/v1/projects/5/forms/survey.svc",
 #'     un = Sys.getenv("ODK_USERNAME"),
 #'     pw = Sys.getenv("ODK_PASSWORD"),
 #'     odkc_version = Sys.getenv("ODKC_VERSION"))

diff --git a/R/get_odk_responses.R b/R/get_odk_responses.R
@@ -19,7 +19,7 @@
 #' @seealso [ruODK::form_schema_ext()]
 #' @examples
 #' \dontrun{
-#'     get_odk_responses(url ="https://odk.eha.io/v1/projects/5/forms/RVF2_animal_owner.svc",
+#'     get_odk_responses(url ="https://odk.xyz.io/v1/projects/5/forms/survey.svc",
 #'     un = Sys.getenv("ODK_USERNAME"),
 #'     pw = Sys.getenv("ODK_PASSWORD"),
 #'     odkc_version = Sys.getenv("ODKC_VERSION"))

diff --git a/R/read_googlesheets.R b/R/read_googlesheets.R
@@ -16,7 +16,7 @@
 #' }
 #'
 read_googlesheets <-
-  function(key_path = here::here("./auth/rvf2-workflow-automation-2877f538ddb9.json"),
+  function(key_path,
            sheet = "all",
            ss,
            ...) {

diff --git a/man/create_translation_log.Rd b/man/create_translation_log.Rd
diff --git a/man/download_dropbox.Rd b/man/download_dropbox.Rd
diff --git a/man/download_googledrive_files.Rd b/man/download_googledrive_files.Rd
diff --git a/man/dropbox_upload.Rd b/man/dropbox_upload.Rd
diff --git a/man/get_dropbox_val_logs.Rd b/man/get_dropbox_val_logs.Rd
diff --git a/man/get_odk_form_schema.Rd b/man/get_odk_form_schema.Rd
diff --git a/man/get_odk_responses.Rd b/man/get_odk_responses.Rd
diff --git a/man/read_googlesheets.Rd b/man/read_googlesheets.Rd
diff --git a/man/refresh_db_token.Rd b/man/refresh_db_token.Rd