From 4f33f0b774ee6726edc95d62f9c2b24475c1ef56 Mon Sep 17 00:00:00 2001 From: javier-gracia-tabuenca-tuni Date: Thu, 12 Nov 2026 11:03:58 +0200 Subject: [PATCH] Remove 'SourceNameFi is empty' warning from validateUsagiFile ADD_INFO:sourceName_fi is optional, so empty values no longer produce a warning. Co-Authored-By: Claude Opus 5.5 --- R/validateUsagiFile.R | 20 ------------------- man/validateUsagiFile.Rd | 1 - tests/testthat/test-validateUsagiFile.R | 8 +++----- .../testthat/test-validateVocabularyFolder.R | 7 +------ 4 files changed, 4 insertions(+), 32 deletions(-) diff --git a/R/validateUsagiFile.R b/R/validateUsagiFile.R index bf2e2d4..98a0e30 100644 --- a/R/validateUsagiFile.R +++ b/R/validateUsagiFile.R @@ -17,7 +17,6 @@ #' If usagi file has the ADD_INFO:sourceName_fi column: #' - Check if sourceName_fi is less than 1000 characters #' - Check if sourceName_fi is the same for all the rows of a sourceConceptId -#' - Warn if sourceName_fi is empty for APPROVED or UNCHECKED mappingStatus #' #' @param pathToUsagiFile Path to the Usagi mapping file to validate #' @param connection A DatabaseConnector connection object @@ -389,25 +388,6 @@ validateUsagiFile <- function( } else { validationLogR6$SUCCESS("SourceNameFi is not the same for all rows of the sourceConceptId", "") } - - # warn if sourceName_fi is empty, the column is optional so this is not an error - isEmptyNameFi <- usagiTibble$mappingStatus %in% c("APPROVED", "UNCHECKED") & is.na(usagiTibble$`ADD_INFO:sourceName_fi`) - - if (any(isEmptyNameFi)) { - validationLogR6$WARNING( - "SourceNameFi is empty", - paste0("Found ", sum(isEmptyNameFi), " APPROVED or UNCHECKED rows with empty sourceName_fi") - ) - - usagiTibble <- usagiTibble |> - dplyr::mutate(tmpvalidationMessages = dplyr::if_else( - isEmptyNameFi, - paste0(tmpvalidationMessages, " | ", "WARNING: SourceNameFi is empty"), - tmpvalidationMessages - )) - } else { - validationLogR6$SUCCESS("SourceNameFi is empty", "") - } } # - Check if ADD_INFO:sourceValidStartDate and ADD_INFO:sourceValidEndDate are used diff --git a/man/validateUsagiFile.Rd b/man/validateUsagiFile.Rd index a8b5ad7..307e449 100644 --- a/man/validateUsagiFile.Rd +++ b/man/validateUsagiFile.Rd @@ -40,6 +40,5 @@ If usagi file has C&CR columns: If usagi file has the ADD_INFO:sourceName_fi column: \item Check if sourceName_fi is less than 1000 characters \item Check if sourceName_fi is the same for all the rows of a sourceConceptId -\item Warn if sourceName_fi is empty for APPROVED or UNCHECKED mappingStatus } } diff --git a/tests/testthat/test-validateUsagiFile.R b/tests/testthat/test-validateUsagiFile.R index 7127132..e23fde8 100644 --- a/tests/testthat/test-validateUsagiFile.R +++ b/tests/testthat/test-validateUsagiFile.R @@ -353,8 +353,7 @@ test_that("test validateUsagiFile validates ADD_INFO:sourceName_fi", { validationsSummary |> dplyr::filter(type != "SUCCESS") |> dplyr::pull(step) |> expect_setequal(c( "SourceNameFi is more than 1000 characters", - "SourceNameFi is not the same for all rows of the sourceConceptId", - "SourceNameFi is empty" + "SourceNameFi is not the same for all rows of the sourceConceptId" )) # SourceNameFi is more than 1000 characters @@ -369,10 +368,9 @@ test_that("test validateUsagiFile validates ADD_INFO:sourceName_fi", { expect_equal(rep("ERROR: SourceNameFi is not the same for all rows of the sourceConceptId", 2)) validatedUsagiFile |> dplyr::filter(sourceCode == "A02.2+H22.0") |> dplyr::pull(mappingStatus) |> expect_equal(rep("FLAGGED", 2)) - # SourceNameFi is empty, only a warning, mappingStatus is not changed - validationsSummary |> dplyr::filter(step == "SourceNameFi is empty") |> dplyr::pull(type) |> as.character() |> expect_equal("WARNING") + # empty sourceName_fi is allowed, no message and mappingStatus is not changed validatedUsagiFile |> dplyr::filter(sourceCode == "A01.0+I39.8") |> dplyr::pull(`ADD_INFO:validationMessages`) |> - expect_equal("WARNING: SourceNameFi is empty") + expect_equal(NA_character_) validatedUsagiFile |> dplyr::filter(sourceCode == "A01.0+I39.8") |> dplyr::pull(mappingStatus) |> expect_equal("APPROVED") }) diff --git a/tests/testthat/test-validateVocabularyFolder.R b/tests/testthat/test-validateVocabularyFolder.R index 95aa62b..597b028 100644 --- a/tests/testthat/test-validateVocabularyFolder.R +++ b/tests/testthat/test-validateVocabularyFolder.R @@ -23,12 +23,7 @@ test_that("validateVocabularyFolder returns all SUCCESS for valid vocabulary fol ) # Check validation results - # only warning: UNITfi has the ADD_INFO:sourceName_fi column but all values are empty - notSuccess <- validationsLogTibble |> dplyr::filter(type != "SUCCESS") - notSuccess |> nrow() |> expect_equal(1) - notSuccess |> dplyr::pull(context) |> as.character() |> expect_equal("UNITfi") - notSuccess |> dplyr::pull(type) |> as.character() |> expect_equal("WARNING") - notSuccess |> dplyr::pull(step) |> expect_equal("SourceNameFi is empty") + validationsLogTibble |> dplyr::filter(type != "SUCCESS") |> nrow() |> expect_equal(0) # Check that validated files were created expect_true(dir.exists(pathToValidatedVocabularyFolder))