Merge pull request #152 from opendatakit/cxlt/odata-fixes

minor odata bugs
getodk · Nov 2, 2018 · f9c0c06 · f9c0c06
2 parents 8d186c6 + 628728c
commit f9c0c06
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/lib/model/query/submissions.js b/lib/model/query/submissions.js
@@ -56,6 +56,7 @@ module.exports = {
         .where(options.condition)
         .where({ deletedAt: null })
         .orderBy('createdAt', 'desc')
+        .orderBy('id', 'desc')
         .modify(applyPagingOptions(options))
       : db.select(fieldsForJoin({
         submission: { table: 'submissions', fields: Submission.fields() },
@@ -69,6 +70,7 @@ module.exports = {
           'submissions.submitter', 'actors.id'
         )
         .orderBy('submissions.createdAt', 'desc')
+        .orderBy('submissions.id', 'desc')
         .modify(applyPagingOptions(options))),
 
     deserializer: (extended = false) => ({ Submission, Actor }) => ((extended === false)

diff --git a/lib/outbound/odata.js b/lib/outbound/odata.js
@@ -309,7 +309,10 @@ const rowStreamToOData = (form, table, domain, originalUrl, query, inStream, tab
       // rows.
       const totalCount = ((table === 'Submissions') && (tableCount != null)) ? tableCount : counted;
       const nextUrl = nextUrlFor(limit, offset, totalCount, originalUrl);
-      this.push(jsonDataFooter({ form, table, domain, serviceRoot, nextUrl, count: (shouldCount ? totalCount : null) }));
+
+      // we do toStrring on the totalCount because mustache won't bother rendering
+      // the block if it sees integer zero.
+      this.push(jsonDataFooter({ form, table, domain, serviceRoot, nextUrl, count: (shouldCount ? totalCount.toString() : null) }));
       done();
     }
   });

diff --git a/test/integration/api/odata.js b/test/integration/api/odata.js
@@ -222,6 +222,15 @@ describe('api: /forms/:id.svc', () => {
             });
           }))));
 
+    it('should return a count even if there are no rows', testService((service) =>
+      service.login('alice', (asAlice) =>
+        asAlice.get('/v1/forms/withrepeat.svc/Submissions?$count=true')
+          .expect(200)
+          .then(({ body }) => {
+            console.log(body);
+            body['@odata.count'].should.equal(0);
+          }))));
+
     it('should return subtable results', testService((service) =>
       withSubmissions(service, (asAlice) =>
         asAlice.get('/v1/forms/withrepeat.svc/Submissions.children.child')