core_chapter_structure_cols as argument (#29)

NIFU-NO · Jul 22, 2024 · 19dd756 · 19dd756
1 parent 9fe6ff5
commit 19dd756
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/R/validate_chapter_structure.R b/R/validate_chapter_structure.R
@@ -1,5 +1,6 @@
 
-validate_chapter_structure <- function(chapter_structure, data=NULL) {
+validate_chapter_structure <- function(chapter_structure, data=NULL,
+                                       core_chapter_structure_cols = .saros.env$core_chapter_structure_cols) {
 
   # ENSURE THAT .template_name, chapter etc are part of goruping_sturcture?
 
@@ -14,8 +15,8 @@ validate_chapter_structure <- function(chapter_structure, data=NULL) {
 
 
   missing_core_columns <-
-    .saros.env$core_chapter_structure_cols[
-      !.saros.env$core_chapter_structure_cols %in% colnames(chapter_structure)
+    core_chapter_structure_cols[
+      !core_chapter_structure_cols %in% colnames(chapter_structure)
     ]
   if(length(missing_core_columns)>0) {
     cli::cli_abort("{.arg chapter_structure} is missing {.var {missing_core_columns}}.")

diff --git a/R/validate_draft_report_args.R b/R/validate_draft_report_args.R
@@ -19,12 +19,15 @@ validate_draft_report_args <- function(params) {
   }
   is_bool <- function(x) is.logical(x) && length(x) == 1 && !is.na(x)
 
+  core_chapter_structure_cols <-
+    .saros.env$core_chapter_structure_cols
+
 
   arg_params <-
     list(
       # Data frames
       data = list(fun = function(x) inherits(x, "data.frame") || inherits(x, "survey")),
-      chapter_structure = list(fun = function(x) validate_chapter_structure(x)),
+      chapter_structure = list(fun = function(x) validate_chapter_structure(x, core_chapter_structure_cols = core_chapter_structure_cols)),
 
       # Character vectors (not enums)
       mesos_var = list(fun = function(x) is.null(x) || is_string(x)),