Refactor a few things to shrink another PR (#442)

* Refactor a few things to shrink another PR

* Tweak timeouts

Author: cbovis

src/apps/sync-app-definitions.test.js

@@ -7,16 +7,16 @@ jest.mock('./get-app-definitions');
 
 beforeAll(async () => {
   await testUtils.setupDb();
-});
+}, 30000);
 
 afterEach(async () => {
   await testUtils.resetDb();
   jest.resetAllMocks();
-});
+}, 30000);
 
-afterAll(() => {
-  testUtils.tearDownDb();
-});
+afterAll(async () => {
+  await testUtils.tearDownDb();
+}, 30000);
 
 describe('apps/syncAppDefinitions', () => {
   it('should create all app documents when none exist', async () => {

src/consumers/convert-relayer-fees/index.test.js

@@ -10,15 +10,15 @@ jest.mock('../../rates/get-conversion-rate');
 
 beforeAll(async () => {
   await testUtils.setupDb();
-});
+}, 30000);
 
 afterEach(async () => {
   await testUtils.resetDb();
-});
+}, 30000);
 
-afterAll(() => {
-  testUtils.tearDownDb();
-});
+afterAll(async () => {
+  await testUtils.tearDownDb();
+}, 30000);
 
 describe('consumers/convert-relayer-fees', () => {
   it('should throw an error when fillId format is invalid', async () => {

src/consumers/create-token.test.js

@@ -16,11 +16,11 @@ beforeAll(async () => {
 afterEach(async () => {
   jest.resetAllMocks();
   await testUtils.resetDb();
-});
+}, 30000);
 
-afterAll(() => {
-  testUtils.tearDownDb();
-});
+afterAll(async () => {
+  await testUtils.tearDownDb();
+}, 30000);
 
 describe('consumers.createToken', () => {
   it('should subscribe to token-processing queue and consume create-token jobs', () => {

src/consumers/fetch-transaction/index.test.js

@@ -38,10 +38,10 @@ beforeEach(() => {
 afterEach(async () => {
   jest.clearAllMocks();
   await resetDb();
-});
+}, 30000);
 
 afterAll(async () => {
-  tearDownDb();
+  await tearDownDb();
 }, 30000);
 
 const simpleJob = {

src/events/persist-events.js

@@ -3,7 +3,10 @@ const { getModel } = require('../model');
 const persistEvents = async (events, options) => {
   const Event = getModel('Event');
 
-  await Event.create(events, options);
+  await Event.create(
+    events.map(event => ({ ...event, dateIngested: new Date() })),
+    options,
+  );
 };
 
 module.exports = persistEvents;

src/fills/convert-protocol-fee.js

@@ -2,17 +2,19 @@ const { JOB, QUEUE } = require('../constants');
 const { publishJob } = require('../queues');
 
 const fetchFillStatus = async (fill, delay) => {
+  const fillId = fill._id.toString();
+
   await publishJob(
     QUEUE.FILL_PROCESSING,
     JOB.CONVERT_PROTOCOL_FEE,
     {
-      fillId: fill._id,
+      fillId,
       fillDate: fill.date,
       protocolFee: fill.protocolFee,
     },
     {
       delay,
-      jobId: `convert-protocol-fee-${fill._id}`,
+      jobId: `convert-protocol-fee-${fillId}`,
     },
   );
 };

src/index/index-traded-tokens.js

@@ -13,6 +13,8 @@ const indexTradedTokens = fill => {
     throw new Error(`No traded tokens for fill: ${fill._id}`);
   }
 
+  const fillId = fill._id.toString();
+
   publishJob(
     QUEUE.TRADED_TOKEN_INDEXING,
     JOB.INDEX_TRADED_TOKENS,
@@ -22,11 +24,11 @@ const indexTradedTokens = fill => {
         type: app.type,
       })),
       date: fill.date,
-      fillId: fill._id,
+      fillId,
       relayerId: fill.relayerId,
       tradedTokens,
     },
-    { jobId: `index-traded-tokens-${fill._id}` },
+    { jobId: `index-traded-tokens-${fillId}` },
   );
 };
 

src/jobs/batch-schedule-transaction-fetch.js

@@ -1,12 +1,8 @@
-const signale = require('signale');
-
 const { JOB, QUEUE } = require('../constants');
 const { publishJob } = require('../queues');
 const Event = require('../model/event');
 
-const logger = signale.scope('batch schedule transaction fetch');
-
-const batchScheduleTransactionFetch = async ({ batchSize }) => {
+const batchScheduleTransactionFetch = async ({ batchSize }, { logger }) => {
   logger.info(`scheduling transaction fetch for batch of fills: ${batchSize}`);
 
   // Fetch a batch of unprocessed events

src/jobs/create-fills/persist-fill.test.js

@@ -6,15 +6,15 @@ const testUtils = require('../../test-utils');
 
 beforeAll(async () => {
   await testUtils.setupDb();
-});
-
-afterAll(() => {
-  testUtils.tearDownDb();
-});
+}, 30000);
 
 afterEach(async () => {
   await testUtils.resetDb();
-});
+}, 30000);
+
+afterAll(async () => {
+  await testUtils.tearDownDb();
+}, 30000);
 
 const simpleFill = {
   _id: '5bb1f06b62f9ca0004c7cf20',
@@ -127,7 +127,7 @@ it('should persist fill', async () => {
     protocolVersion: 3,
     relayerId: 15,
     senderAddress: '0xd3d0474124c1013ed6bfcfd9a49cfedb8c78fc44',
-    status: 0,
+    status: 1,
     taker: '0x7447dab10325f902725191a34eb8288abe02c7f4',
     transactionHash:
       '0x28ffb48f354997d384eee49d326c13a10c4584ca3bced4632053b201d3a0cbbc',

src/model/event.js

@@ -2,18 +2,22 @@ const mongoose = require('mongoose');
 
 const { Schema } = mongoose;
 
-const schema = Schema({
-  blockNumber: { required: true, type: Number },
-  data: { required: true, type: Schema.Types.Mixed },
-  fillCreated: { type: Boolean },
-  logIndex: { required: true, type: Number },
-  protocolVersion: { required: true, type: Number },
-  scheduler: {
-    transactionFetchScheduled: Boolean,
+const schema = Schema(
+  {
+    blockNumber: { required: true, type: Number },
+    dateIngested: { required: true, type: Date },
+    data: { required: true, type: Schema.Types.Mixed },
+    fillCreated: { type: Boolean },
+    logIndex: { required: true, type: Number },
+    protocolVersion: { required: true, type: Number },
+    scheduler: {
+      transactionFetchScheduled: Boolean,
+    },
+    transactionHash: { required: true, type: String },
+    type: { required: true, type: String },
   },
-  transactionHash: { required: true, type: String },
-  type: { required: true, type: String },
-});
+  { strict: 'throw' },
+);
 
 schema.index({ fillCreated: 1 });
 schema.index({ logIndex: 1, transactionHash: 1 }, { unique: true });