Clarify wtf_metadata_match message

COMPASS-DOE · Feb 29, 2024 · 3957fe0 · 3957fe0
1 parent 0c51d11
commit 3957fe0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/R/metadata.R b/R/metadata.R
@@ -86,14 +86,16 @@ wtf_metadata_match <- function(data_timestamps,
   matches <- rep(NA_real_, length(data_timestamps))
   entries <- seq_along(start_timestamps)
   for(i in entries) {
-    mtch <- data_timestamps >= start_timestamps[i] & data_timestamps <= stop_timestamps[i]
+    mtch <- data_timestamps >= start_timestamps[i] & data_timestamps < stop_timestamps[i]
     matches[mtch] <- i
   }
 
   # Metadata rows with zero matches seems unexpected
   no_matches <- base::setdiff(entries, unique(matches, na.omit(matches)))
-  if(length(no_matches)) {
-    wtf_message("Entries with no timestamp matches: ", paste(no_matches, collapse = ", "))
+  lnm <- length(no_matches)
+  if(lnm) {
+    wtf_message(lnm, ifelse(lnm == 1, " entry", " entries"),
+                " had no timestamp matches!")
   }
 
   return(matches)

diff --git a/tests/testthat/test-metadata.R b/tests/testthat/test-metadata.R
@@ -61,5 +61,5 @@ test_that("wtf_metadata_match works", {
   s_d <- c("2024-01-01", "2024-01-01", "2024-01-10")
   s_t <- c("13:00:00", "13:05:00", "13:10:00")
   expect_message(wtf_metadata_match(d_t, s_d, s_t, c(60, 60, 60)),
-                 regexp = "no timestamp matches: 3")
+                 regexp = "1 entry had no timestamp matches")
 })