Skip to content

Allow == and != against empty string #401

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

Open
mgaffigan wants to merge 1 commit into
base: main
Choose a base branch
from
+38 −4
Open

Allow == and != against empty string #401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 8 additions & 4 deletions .../main/java/com/mirth/connect/client/ui/browsers/message/MessageBrowserAdvancedFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,20 +383,24 @@ private List<MetaDataSearchElement> getMetaDataSearch() throws MetaDataColumnExc
} else {
for (int i = 0; i < rowCount; i++) {
String metaDataName = (String) model.getValueAt(i, 0);
String operator = ((MetaDataSearchOperator) model.getValueAt(i, 1)).toFullString();
MetaDataSearchOperator operator = (MetaDataSearchOperator) model.getValueAt(i, 1);
String searchText = (String) model.getValueAt(i, 2);
Boolean ignoreCase = (Boolean) model.getValueAt(i, 3);
MetaDataColumn column = cachedMetaDataColumns.get(metaDataName);

if (StringUtils.isNotEmpty(searchText)) {
MetaDataColumn column = cachedMetaDataColumns.get(metaDataName);
metaDataSearch.add(new MetaDataSearchElement(metaDataName, operator, column.getType().castValue(searchText), ignoreCase));
if (shouldIncludeMetaDataSearch(column.getType(), operator, searchText)) {
metaDataSearch.add(new MetaDataSearchElement(metaDataName, operator.toFullString(), column.getType().castValue(searchText), ignoreCase));
}
}

return metaDataSearch;
}
}

static boolean shouldIncludeMetaDataSearch(MetaDataColumnType columnType, MetaDataSearchOperator operator, String searchText) {
return StringUtils.isNotEmpty(searchText) || (columnType == MetaDataColumnType.STRING && (operator == MetaDataSearchOperator.EQUAL || operator == MetaDataSearchOperator.NOT_EQUAL));
}

@Override
public void setVisible(boolean visible) {
if (visible) {
Expand Down
30 changes: 30 additions & 0 deletions ...t/java/com/mirth/connect/client/ui/browsers/message/MessageBrowserAdvancedFilterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
package com.mirth.connect.client.ui.browsers.message;

import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;

import org.junit.Test;

import com.mirth.connect.donkey.model.channel.MetaDataColumnType;
import com.mirth.connect.model.filters.elements.MetaDataSearchOperator;

public class MessageBrowserAdvancedFilterTest {

@Test
public void shouldIncludeBlankStringEqualitySearches() {
assertTrue(MessageBrowserAdvancedFilter.shouldIncludeMetaDataSearch(MetaDataColumnType.STRING, MetaDataSearchOperator.EQUAL, ""));
assertTrue(MessageBrowserAdvancedFilter.shouldIncludeMetaDataSearch(MetaDataColumnType.STRING, MetaDataSearchOperator.NOT_EQUAL, ""));
}

@Test
public void shouldIgnoreBlankNonEqualitySearches() {
assertFalse(MessageBrowserAdvancedFilter.shouldIncludeMetaDataSearch(MetaDataColumnType.STRING, MetaDataSearchOperator.CONTAINS, ""));
assertFalse(MessageBrowserAdvancedFilter.shouldIncludeMetaDataSearch(MetaDataColumnType.NUMBER, MetaDataSearchOperator.EQUAL, ""));
}

@Test
public void shouldIncludeNonBlankSearches() {
assertTrue(MessageBrowserAdvancedFilter.shouldIncludeMetaDataSearch(MetaDataColumnType.STRING, MetaDataSearchOperator.CONTAINS, "value"));
assertTrue(MessageBrowserAdvancedFilter.shouldIncludeMetaDataSearch(MetaDataColumnType.NUMBER, MetaDataSearchOperator.EQUAL, "1"));
}
}
Loading