fixes #701: don't start transaction for POST submission.csv (#917)

getodk · Jul 3, 2023 · 891edc2 · 891edc2
1 parent 5415280
commit 891edc2
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/lib/http/endpoint.js b/lib/http/endpoint.js
@@ -34,7 +34,7 @@ const Problem = require('../util/problem');
 
 // determines if a request needs a transaction.
 const phony = (request) => {
-  if (/submissions\.csv\.zip$/i.test(request.path)) return true;
+  if (/submissions\.csv(\.zip)?$/i.test(request.path)) return true;
   return false;
 };
 const isWriteRequest = (request) => !phony(request) &&

diff --git a/test/unit/http/endpoint.js b/test/unit/http/endpoint.js
@@ -361,20 +361,20 @@ describe('endpoints', () => {
             .then(() => { transacted.should.equal(false); });
         })));
 
-      it('should not initiate a transaction given a nonwrite POST', () => {
-        let transacted = false;
-        const container = {
-          transacting(cb) { transacted = true; return cb(); },
-          with() { return container; }
-        };
+      it('should not initiate a transaction given a nonwrite POST', () =>
+        Promise.all([
+          '/projects/1/forms/encrypted/submissions.csv',
+          '/projects/1/forms/encrypted/submissions.csv.zip'
+        ].map((path) => {
+          let transacted = false;
+          const container = {
+            transacting(cb) { transacted = true; return cb(); },
+            with() { return container; }
+          };
 
-        const request = {
-          method: 'POST',
-          path: '/projects/1/forms/encrypted/submissions.csv.zip'
-        };
-        return endpointBase({ resultWriter: noop })(container)(always(true))(request)
-          .then(() => { transacted.should.equal(false); });
-      });
+          return endpointBase({ resultWriter: noop })(container)(always(true))({ method: 'POST', path })
+            .then(() => { transacted.should.equal(false); });
+        })));
 
       it('should reject on the transacting promise on preprocessor failure', () => {
         // we still check the transacted flag just to be sure the rejectedWith assertion runs.