improve: minor code cleanup after code review.

lib/model/frames/submission.js

@@ -20,7 +20,7 @@ const Problem = require('../../util/problem');
 
 class Submission extends Frame.define(
   table('submissions'),
-  'id',         readable,               'formId',       readable,
+  'id',                                 'formId',
   'instanceId', readable,               'submitterId',  readable,
   'deviceId',   readable,               'createdAt',    readable,
   'updatedAt',  readable,

lib/model/migrations/20210120-01-instance-names.js

@@ -26,7 +26,9 @@ const up = async (db) => {
   await Promise.all(work);
 };
 
-const down = () => {};
+const down = (db) => db.schema.table('submission_defs', (sds) => {
+  sds.dropColumn('instanceName');
+});
 
 module.exports = { up, down };
 

lib/worker/worker.js

@@ -30,7 +30,7 @@ const runner = (container, jobMap) => {
     const logname = `${event.action}::${loggedAt}::${event.acteeId}`;
     process.stdout.write(`[${(new Date()).toISOString()}] start processing event ${logname} (${jobs.length} jobs)\n`);
     container.transacting((tc) => timebound(Promise.all(jobs.map((f) => f(tc, event))))
-      .then(() => tc.run(sql`update audits set processed=now() where id=${event.id}`)))
+      .then(() => tc.run(sql`update audits set processed=clock_timestamp() where id=${event.id}`)))
       .then(() => { process.stdout.write(`[${(new Date()).toISOString()}] finish processing event ${logname}\n`); })
       .catch((err) => {
         // Something Bad has happened and we'd like to log the error if we can,
@@ -44,7 +44,7 @@ const runner = (container, jobMap) => {
         }
         /* eslint-enable */
 
-        return run(sql`update audits set claimed=null, failures=${event.failures + 1}, "lastFailure"=now() where id=${event.id}`)
+        return run(sql`update audits set claimed=null, failures=${event.failures + 1}, "lastFailure"=clock_timestamp() where id=${event.id}`)
           .then(() => resolve());
       })
       .then(reschedule, reschedule);
@@ -65,7 +65,7 @@ with q as
     order by "loggedAt" asc
     limit 1
     for update)
-update audits set claimed=now() from q where audits.id=q.id returning *`)
+update audits set claimed=clock_timestamp() from q where audits.id=q.id returning *`)
   .then(head);
 
 // main loop. kicks off a check and attempts to process the result of the check.

test/integration/api/forms.js

@@ -2347,7 +2347,7 @@ describe('api: /projects/:id/forms', () => {
           asChelsea.get('/v1/projects/1/forms/simple/versions')
             .expect(403))));
 
-      it('should list all versions', testService((service, XXXXX) =>
+      it('should list all versions', testService((service) =>
         service.login('alice', (asAlice) =>
           asAlice.post('/v1/projects/1/forms/simple/draft')
             .send(testData.forms.simple.replace('id="simple"', 'id="simple" version="2"'))

test/integration/api/projects.js

@@ -212,7 +212,7 @@ describe('api: /projects', () => {
               audit.isDefined().should.equal(true);
               audit.get().actorId.should.equal(user.body.id);
               audit.get().details.data.name.should.equal('Test Project');
-              return one(sql`select *  from projects where "acteeId"=${audit.get().acteeId}`)
+              return one(sql`select * from projects where "acteeId"=${audit.get().acteeId}`)
                 .then((project) => { project.id.should.equal(body.id); });
             })))));
   });

test/integration/api/sessions.js

@@ -4,14 +4,13 @@ const { testService } = require('../setup');
 
 describe('api: /sessions', () => {
   describe('POST', () => {
-    it('should return a new session if the information is valid', testService((service) => {
-      return service.post('/v1/sessions')
+    it('should return a new session if the information is valid', testService((service) =>
+      service.post('/v1/sessions')
         .send({ email: 'chelsea@opendatakit.org', password: 'chelsea' })
         .expect(200)
         .then(({ body }) => {
           body.should.be.a.Session();
-        });
-    }));
+        })));
 
     it('should treat email addresses case insensitively', testService((service) =>
       service.post('/v1/sessions')

test/unit/model/container.js

@@ -41,9 +41,7 @@ describe('container', () => {
           done();
         });
     });
-  });
 
-  describe('query modules', () => {
     it('should provide database context to query modules', (done) => {
       const module = { proc: (x) => ({ db }) => Promise.resolve(x + db) };
       const { injected } = injector({ db: 7 }, { injected: module });

test/unit/util/db.js

@@ -12,7 +12,7 @@ describe('util/db', () => {
     const T = Frame.define(table('frames'), 'x',  'y');
     const U = Frame.define(into('extra'), 'z');
     it('should generate fields', () => {
-      unjoiner(Frame.define(table('frames'), 'x',  'y'), Frame.define('z'))
+      unjoiner(T, U)
         .fields.should.eql(sql`frames."x" as "frames!x",frames."y" as "frames!y","z" as "z"`);
     });