Merge pull request #448 from AllenInstitute/bugfix/wrong-values-in-group

Fix SQL for groupings and csv downloads

Author: aswallace

packages/core/entity/FileSet/index.ts

@@ -211,7 +211,7 @@ export default class FileSet {
 
         Object.entries(filtersGroupedByAnnotation).forEach(([_, appliedFilters]) => {
             sqlBuilder.where(
-                appliedFilters.map((filter) => filter.toSQLWhereString()).join(") OR (")
+                appliedFilters.map((filter) => filter.toSQLWhereString()).join(" OR ")
             );
         });
 

packages/core/entity/FileSet/test/FileSet.test.ts

@@ -127,7 +127,7 @@ describe("FileSet", () => {
                 'WHERE (REGEXP_MATCHES("scientist"'
             );
             expect(fileSet.toQuerySQLBuilder().from(mockDatasource).toString()).to.contain(
-                'OR (REGEXP_MATCHES("scientist"'
+                'OR REGEXP_MATCHES("scientist"'
             );
         });
     });

packages/core/services/FileService/DatabaseFileService/index.ts

@@ -169,11 +169,9 @@ export default class DatabaseFileService implements FileService {
     public static applyFiltersAndSorting(subQuery: SQLBuilder, selection: Selection): void {
         if (!isEmpty(selection.filters)) {
             subQuery.where(
-                Object.entries(selection.filters)
-                    .flatMap(([column, values]) =>
-                        values.map((v) => SQLBuilder.regexMatchValueInList(column, v))
-                    )
-                    .join(") OR (")
+                Object.entries(selection.filters).flatMap(([column, values]) =>
+                    values.map((v) => SQLBuilder.regexMatchValueInList(column, v)).join(" OR ")
+                )
             );
         }
         if (selection.sort) {

packages/core/services/FileService/DatabaseFileService/test/DatabaseFileService.test.ts

@@ -154,5 +154,45 @@ describe("DatabaseFileService", () => {
             // Assert
             expect(modifiedSQL).to.include("OFFSET 0 LIMIT 3");
         });
+
+        it("correctly applies AND vs OR clauses", () => {
+            const selectionsWithOR = [
+                {
+                    indexRanges: [{ start: 0, end: 2 }], // File range
+                    filters: {
+                        Structure: ["structure1", "structure2"],
+                    },
+                },
+            ];
+            const selectionsWithAND = [
+                {
+                    indexRanges: [{ start: 0, end: 2 }], // File range
+                    filters: {
+                        "Cell Line": ["AICS-01"],
+                        Structure: ["structure1"],
+                    },
+                },
+            ];
+            // Make a separate SQLBuilder for comparison
+            const sqlBuilderAND = new SQLBuilder().select("*").from("mock_source");
+
+            // Act
+            DatabaseFileService.applySelectionFilters(sqlBuilder, selectionsWithOR, [
+                "mock_source",
+            ]);
+            const modifiedSQLWithOR = normalizeSQL(sqlBuilder.toSQL());
+            DatabaseFileService.applySelectionFilters(sqlBuilderAND, selectionsWithAND, [
+                "mock_source",
+            ]);
+            const modifiedSQLWithAND = normalizeSQL(sqlBuilderAND.toSQL());
+
+            // Assert
+            // Uses OR within single filter type
+            expect(modifiedSQLWithOR).to.include("OR");
+            expect(modifiedSQLWithOR).not.to.include("AND");
+            // Uses AND between different filter types
+            expect(modifiedSQLWithAND).to.include("AND");
+            expect(modifiedSQLWithAND).not.to.include("OR");
+        });
     });
 });