Merge pull request #465 from getodk/split-and-filter

bug: allow user to both splitSelectMultiples and $filter.
getodk · Mar 11, 2022 · 367a7f5 · 367a7f5
2 parents 3462cd5 + 0cf3136
commit 367a7f5
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 2 deletions.
diff --git a/lib/model/query/submissions.js b/lib/model/query/submissions.js
@@ -112,8 +112,8 @@ inner join
   on defs.id=form_field_values."submissionDefId"
 inner join
   (select * from submissions
-    where "deletedAt" is null and draft=${draft}) as subs
-  on subs.id=defs."submissionId"
+    where "deletedAt" is null and draft=${draft}) as submissions
+  on submissions.id=defs."submissionId"
 where
   form_field_values."formId"=${formId} and
   ${odataFilter(options.filter)}

diff --git a/test/integration/api/submissions.js b/test/integration/api/submissions.js
@@ -1518,6 +1518,30 @@ describe('api: /forms/:id/submissions', () => {
               done();
             }))))));
 
+    it('should split select multiples and filter given both options', testService((service, container) =>
+      service.login('alice', (asAlice) =>
+        asAlice.post('/v1/projects/1/forms?publish=true')
+          .set('Content-Type', 'application/xml')
+          .send(testData.forms.selectMultiple)
+          .then(() => asAlice.post('/v1/projects/1/forms/selectMultiple/submissions')
+            .set('Content-Type', 'application/xml')
+            .send(testData.instances.selectMultiple.one))
+          .then(() => asAlice.post('/v1/projects/1/forms/selectMultiple/submissions')
+            .set('Content-Type', 'application/xml')
+            .send(testData.instances.selectMultiple.two))
+          .then(() => asAlice.patch('/v1/projects/1/forms/selectMultiple/submissions/two')
+            .send({ reviewState: 'approved' }))
+          .then(() => exhaust(container))
+          .then(() => new Promise((done) =>
+            zipStreamToFiles(asAlice.get('/v1/projects/1/forms/selectMultiple/submissions.csv.zip?splitSelectMultiples=true&$filter=__system/reviewState eq null'), (result) => {
+              const lines = result['selectMultiple.csv'].split('\n');
+              lines.length.should.equal(3);
+              lines[1].should.containEql(',one,');
+              lines[1].should.not.containEql('two');
+              lines[2].should.equal('');
+              done();
+            }))))));
+
     it('should export deleted fields and values if ?deletedFields=true', testService((service) =>
       service.login('alice', (asAlice) =>
         asAlice.post('/v1/projects/1/forms/simple/submissions')