Small code changes related to entities and datasets (getodk#769)

Author: ktuite

lib/data/entity.js

@@ -99,7 +99,7 @@ const formatRow = (entity, props) => {
   return out;
 };
 
-const streamEntityCsvs = (inStream, properties) => {
+const streamEntityCsv = (inStream, properties) => {
   const header = [ 'name', 'label' ];
   const props = [];
 
@@ -110,25 +110,25 @@ const streamEntityCsvs = (inStream, properties) => {
     props.push(prop);
   }
 
-  let rootHeaderSent = false;
-  const rootStream = new Transform({
+  let headerSent = false;
+  const entityStream = new Transform({
     objectMode: true,
     transform(entity, _, done) {
       try {
-        if (rootHeaderSent === false) {
+        if (headerSent === false) {
           this.push(header);
-          rootHeaderSent = true;
+          headerSent = true;
         }
         this.push(formatRow(entity, props));
         done();
       } catch (ex) { done(ex); }
     }, flush(done) {
-      if (rootHeaderSent === false) this.push(header);
+      if (headerSent === false) this.push(header);
       done();
     }
   });
 
-  return PartialPipe.of(inStream, rootStream, csv());
+  return PartialPipe.of(inStream, entityStream, csv());
 };
 
 const selectFields = (entity, properties, selectedProperties) => {
@@ -239,7 +239,7 @@ const streamEntityOdata = (inStream, properties, domain, originalUrl, query, tab
 
 module.exports = {
   parseSubmissionXml, validateEntity,
-  streamEntityCsvs, streamEntityOdata,
+  streamEntityCsv, streamEntityOdata,
   odataToColumnMap,
   extractSelectedProperties, selectFields
 };

lib/model/query/form-attachments.js

@@ -136,7 +136,7 @@ const getAllByFormDefIdForOpenRosa = (formDefId) => ({ all }) => all(sql`
 select ${_unjoinMd5.fields} from form_attachments
   left outer join (select id, md5 from blobs) as blobs on form_attachments."blobId"=blobs.id
   left outer join (
-    select d.id, max(e."updatedAt") "dsUpdatedAt" from datasets d left outer join entities e on d.id = e."datasetId" group by d.id
+    select d.id, max(coalesce(e."updatedAt", e."createdAt")) "dsUpdatedAt" from datasets d left outer join entities e on d.id = e."datasetId" group by d.id
   ) as ds on form_attachments."datasetId"=ds.id
   where "formDefId"=${formDefId}`)
   .then(map(_unjoinMd5));

lib/model/query/submissions.js

@@ -180,7 +180,7 @@ where submissions."instanceId"=${instanceId}
   and submissions."deletedAt" is null
   and draft=${draft}
   and submission_defs.current=true`)
-  .then(map((row) => new Submission.Partial(row, { def: new Submission.Def({ id: row.defId }) })));
+  .then(map((row) => new Submission(row, { def: new Submission.Def({ id: row.defId }) })));
 
 const getCurrentDefByIds = (projectId, xmlFormId, instanceId, draft) => ({ maybeOne }) => maybeOne(sql`
 select submission_defs.* from submission_defs

lib/resources/datasets.js

@@ -9,7 +9,7 @@
 
 const sanitize = require('sanitize-filename');
 const { getOrNotFound } = require('../util/promise');
-const { streamEntityCsvs } = require('../data/entity');
+const { streamEntityCsv } = require('../data/entity');
 const { contentDisposition } = require('../util/http');
 
 module.exports = (service, endpoint) => {
@@ -38,6 +38,6 @@ module.exports = (service, endpoint) => {
             const extension = 'csv';
             response.append('Content-Disposition', contentDisposition(`${filename}.${extension}`));
             response.append('Content-Type', 'text/csv');
-            return streamEntityCsvs(entities, dataset.properties);
+            return streamEntityCsv(entities, dataset.properties);
           })))));
 };

lib/resources/forms.js

@@ -19,7 +19,7 @@ const { getOrNotFound, reject, resolve, rejectIf } = require('../util/promise');
 const { success } = require('../util/http');
 const { formList, formManifest } = require('../formats/openrosa');
 const { noargs, isPresent, isBlank } = require('../util/util');
-const { streamEntityCsvs } = require('../data/entity');
+const { streamEntityCsv } = require('../data/entity');
 
 // excel-related util funcs/data used below:
 const isExcel = (contentType) => (contentType === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet') || (contentType === 'application/vnd.ms-excel');
@@ -288,7 +288,7 @@ module.exports = (service, endpoint) => {
                   .then((entities) => {
                     response.append('Content-Disposition', contentDisposition(`${attachment.name}`));
                     response.append('Content-Type', 'text/csv');
-                    return streamEntityCsvs(entities, dataset.properties);
+                    return streamEntityCsv(entities, dataset.properties);
                   }))))))));
   };