Merge branch 'release-2.12.x' into TASK-5535

opencb · May 14, 2024 · a801457 · a801457
2 parents b73503d + 9cf2ecd
commit a801457
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 7 deletions.
diff --git a/opencga-catalog/src/main/java/org/opencb/opencga/catalog/db/mongodb/FileMongoDBAdaptor.java b/opencga-catalog/src/main/java/org/opencb/opencga/catalog/db/mongodb/FileMongoDBAdaptor.java
@@ -1517,20 +1517,15 @@ private Bson parseQuery(Query query, Document extraQuery, String user)
                             addAutoOrQuery(queryParam.key(), queryParam.key(), myQuery, queryParam.type(), andBsonList);
                         }
                         break;
-                    case FORMAT:
-                    case BIOFORMAT:
-                        // Replace the value for an uppercase string as we know it will always be in that way
-                        String uppercaseValue = myQuery.getString(queryParam.key()).toUpperCase();
-                        myQuery.put(queryParam.key(), uppercaseValue);
-                        addAutoOrQuery(queryParam.key(), queryParam.key(), myQuery, queryParam.type(), andBsonList);
-                        break;
                     case UUID:
                     case EXTERNAL:
                     case TYPE:
                     case URI:
                     case ID:
                     case PATH:
                     case RELEASE:
+                    case FORMAT:
+                    case BIOFORMAT:
                     case TAGS:
                     case SIZE:
                     case SOFTWARE_NAME:

diff --git a/opencga-catalog/src/test/java/org/opencb/opencga/catalog/managers/FileManagerTest.java b/opencga-catalog/src/test/java/org/opencb/opencga/catalog/managers/FileManagerTest.java
@@ -194,6 +194,32 @@ public void testLinkFileWithoutReadPermissions() throws IOException, CatalogExce
         fileManager.link(studyFqn, new FileLinkParams().setUri(file.getPath()), false, token);
     }
 
+    @Test
+    public void filterByFormatTest() throws CatalogException {
+        Query query = new Query(FileDBAdaptor.QueryParams.FORMAT.key(), "PLAIN");
+        OpenCGAResult<File> search = catalogManager.getFileManager().search(studyFqn, query, QueryOptions.empty(), token);
+        assertEquals(2, search.getNumResults());
+
+        query = new Query(FileDBAdaptor.QueryParams.FORMAT.key(), "plain");
+        search = catalogManager.getFileManager().search(studyFqn, query, QueryOptions.empty(), token);
+        assertEquals(0, search.getNumResults());
+
+        // Case sensitive search in lower case
+        query = new Query(FileDBAdaptor.QueryParams.FORMAT.key(), "~/^pla/");
+        search = catalogManager.getFileManager().search(studyFqn, query, QueryOptions.empty(), token);
+        assertEquals(0, search.getNumResults());
+
+        // Case sensitive in upper case
+        query = new Query(FileDBAdaptor.QueryParams.FORMAT.key(), "~/^PLA/");
+        search = catalogManager.getFileManager().search(studyFqn, query, QueryOptions.empty(), token);
+        assertEquals(2, search.getNumResults());
+
+        // Case insensitive search
+        query = new Query(FileDBAdaptor.QueryParams.FORMAT.key(), "~/^pla/i");
+        search = catalogManager.getFileManager().search(studyFqn, query, QueryOptions.empty(), token);
+        assertEquals(2, search.getNumResults());
+    }
+
     @Test
     public void createDirectoryTest() throws CatalogException {
         FileCreateParams params = new FileCreateParams()