datasets/:name is extendable

getodk · Sep 1, 2023 · c6b9524 · c6b9524
1 parent 72a3d84
commit c6b9524
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/lib/resources/datasets.js b/lib/resources/datasets.js
@@ -22,8 +22,8 @@ module.exports = (service, endpoint) => {
       .then((project) => auth.canOrReject('dataset.list', project))
       .then(() => Datasets.getList(params.id, queryOptions))));
 
-  service.get('/projects/:projectId/datasets/:name', endpoint(({ Datasets }, { params, auth }) =>
-    Datasets.get(params.projectId, params.name)
+  service.get('/projects/:projectId/datasets/:name', endpoint(({ Datasets }, { params, auth, queryOptions }) =>
+    Datasets.get(params.projectId, params.name, true, queryOptions.extended)
       .then(getOrNotFound)
       .then((dataset) => auth.canOrReject('dataset.read', dataset)
         .then(() => Datasets.getMetadata(dataset)))));

diff --git a/lib/resources/odata.js b/lib/resources/odata.js
@@ -62,14 +62,12 @@ module.exports = (service, endpoint) => {
     service.get(`${base}/:table`, endpoint.odata.json(({ Forms, Submissions, env }, { auth, params, originalUrl, query }) =>
       getForm(Forms, auth, params)
         .then((form) => {
-          const delay = ms => new Promise(resolve => setTimeout(resolve, ms))
           const options = QueryOptions.fromODataRequest(params, query);
-          return Promise.all([            
+          return Promise.all([
             Forms.getFields(form.def.id).then(selectFields(query, params.table)),
             Submissions.streamForExport(form.id, draft, undefined, options),
             ((params.table === 'Submissions') && options.hasPaging())
-              ? Submissions.countByFormId(form.id, draft, options) : resolve({}),
-            delay(2000)
+              ? Submissions.countByFormId(form.id, draft, options) : resolve({})
           ])
             .then(([fields, stream, { count, remaining }]) =>
               json(rowStreamToOData(fields, params.table, env.domain, originalUrl, query, stream, count, remaining)));

diff --git a/test/integration/api/odata-entities.js b/test/integration/api/odata-entities.js
@@ -183,8 +183,7 @@ describe('api: /datasets/:name.svc', () => {
       await createSubmissions(asAlice, container, 5);
 
       const uuids = await asAlice.get('/v1/projects/1/datasets/people/entities')
-        .then(({body}) => body.map(e => e.uuid));
-
+        .then(({ body }) => body.map(e => e.uuid));
 
       const nextlink = await asAlice.get('/v1/projects/1/datasets/people.svc/Entities?$top=2&$count=true')
         .expect(200)