Skip to content

Tweak has field #248

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jwildfire merged 2 commits into from
Apr 22, 2019
Merged

Tweak has field #248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c2e79f4
allow null in hasField/Column checks. fix #240
jwildfire Apr 22, 2019
12faa02
Merge branch 'dev-v0.10.0' into tweak-hasField
jwildfire Apr 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions R/hasColumn.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,15 @@

hasColumn <- function(columnName, data){
stopifnot(
typeof(columnName)=="character",
length(columnName)==1,
typeof(columnName)=="character" || is.null(columnName),
length(columnName)==1 || is.null(columnName),
is.data.frame(data)
)

return(toupper(columnName) %in% toupper(colnames(data)))
if(is.null(columnName)){
return(FALSE)
} else {
return(toupper(columnName) %in% toupper(colnames(data)))
}

}
22 changes: 13 additions & 9 deletions R/hasField.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,22 @@
hasField<- function(fieldValue, columnName, data){
stopifnot(
length(fieldValue)==1,
typeof(columnName)=="character",
length(columnName)==1,
typeof(columnName)=="character" || is.null(columnName),
length(columnName)==1 || is.null(columnName),
is.data.frame(data)
)

columnFound <- hasColumn(columnName=columnName, data=data)
if(columnFound){
if(is.null(columnName)){
return(FALSE)
} else {
columnFound <- hasColumn(columnName=columnName, data=data)
if(columnFound){
validFields <- unique(data[[columnName]])
} else{
validFields <- c()
}

validFields <- unique(data[[columnName]])
} else{
validFields <- c()
return(fieldValue %in% validFields)
}

validFields <- unique(data[[columnName]])
return(fieldValue %in% validFields)
}
5 changes: 4 additions & 1 deletion tests/testthat/test_hasColumn.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,10 @@ test_that("columns are found when expected",{
# returns false when fieldValue isn't there or there is a type mismatch
expect_false(hasColumn(columnName="PARAMETER",data=adlbc))
expect_false(hasColumn(columnName="SUBJID2",data=adlbc))


# returns false for null columnName
expect_false(hasColumn(columnName=NULL,data=adlbc))

# fails with invalid parameters
expect_error(hasColumn(columnName=123,data=adlbc))
expect_error(hasColumn(columnName=c("PARAM","SUBJID"),data=adlbc))
Expand Down
3 changes: 3 additions & 0 deletions tests/testthat/test_hasField.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ test_that("fields are found when expected",{
expect_false(hasField(fieldValue="Not_a_real_value",columnName="PARAM",data=adlbc))
expect_false(hasField(fieldValue=12,columnName="PARAM",data=adlbc))

# returns false for null columnName
expect_false(hasField(fieldValue="Bilirubin (umol/L)",columnName=NULL,data=adlbc))

# fails with invalid parameters
expect_error(hasField(fieldValue="Bilirubin (umol/L)",columnName=c("PARAM","ID"),data=adlbc))
expect_error(hasField(columnName="PARAM",data=list(adlbc))) #fieldValue missing
Expand Down