expand and correct testing of ctis fields

rfhb · Jun 27, 2024 · 291fa59 · 291fa59
1 parent f19816f
commit 291fa59
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/R/util_fields.R b/R/util_fields.R
@@ -166,6 +166,7 @@ typeVars <- list(
   "correctiveMeasures.revertedDate" = "ctrDate",
   "correctiveMeasures.sponsorActionRequiredByDate" = "ctrDate",
   "correctiveMeasures.sponsorSubmitDate" = "ctrDate",
+  "decisionDate" = "ctrDate",
   "events.seriousBreaches.awareDate" = "ctrDate",
   "events.seriousBreaches.breachDate" = "ctrDate",
   "events.seriousBreaches.submissionDate" = "ctrDate",

diff --git a/inst/tinytest/ctrdata_ctis.R b/inst/tinytest/ctrdata_ctis.R
@@ -125,6 +125,13 @@ expect_equal(
         con = dbc))),
   "")
 
+# get all trials
+ctrLoadQueryIntoDb(
+  queryterm = "", 
+  register = "CTIS",
+  con = dbc
+)
+
 # get all field names
 tmpFields <- suppressMessages(
   suppressWarnings(
@@ -182,9 +189,8 @@ for (i in unique(groupsNo)) {
 }
 
 tmpFields <- tmpFields[
-  grepl("date$", tmpFields, ignore.case = TRUE) &
-    !grepl("update$", tmpFields, ignore.case = TRUE) &
-    !grepl("^decisionDate$", tmpFields, ignore.case = TRUE)
+  grepl("[.]date$", tmpFields, ignore.case = TRUE) |
+    grepl("Date$", tmpFields, ignore.case = FALSE)
 ]
 
 if (FALSE) {
@@ -219,7 +225,7 @@ for (i in unique(groupsNo)) {
     unique(unlist(
       lapply(
         tmpData[ , -1, drop = FALSE],
-        function(i) sapply(i, function(ii) class(ii)))
+        function(i) sapply(i, function(ii) class(ii))[1])
     )) %in% c("Date", "POSIXct", "POSIXt")
   ))
 }