Fix SQL for groupings and csv downloads

[aswallace]

Context

Addresses two issues:

• Grouping includes incorrect files/values #442 : Groupings include incorrect values when filters are also applied (see this query on staging for an example; note that AICS-11 appears in every group)
• For csv metadata downloads, the wrong file(s) are occasionally processed; e.g., if I selected files from the AICS-16 group, files in AICS-7 might be processed instead (can replicate by going here and downloading the metadata csv for File ID 1. Metadata for File ID 5226 is downloaded instead)

closes #442

Changes

In both cases, the issue was with "OR" syntax

• For the groupings one: Using ") OR (" made the query over-select
• For downloads: "OR" was applied between different filter types instead of within the same filter type

Testing

• Tested manually on both a smaller local testing dataset & on the online Variance dataset
• Added a unit test

[kmitcham]

Would this test detect the "()" issue the change is fixing? Would expect(modifiedSQLWithOR).to.include(" OR ")
allow detection of the old code? If we can match more of the generated SQL for correctness, that might make both the test and the intent of the code more easily readable to future workers.

[aswallace]

This particular test was intended to catch the other bug, where OR was being applied where AND should've been applied. I'll see if I can add a test for the other change as well and possibly clarify this test

[aswallace]

Remembering now that the other unit test I fixed actually does address the ) OR ( change. The problem was that while we did have a unit test that matched more of the generated SQL code, it was matching the wrong thing (our logic and expectation was wrong, not the code)