Merge pull request #97 from wibsonorg/WIB-859/filter-processed-emails

Wib 859/Filter processed emails

notary-api/src/queues/notarizationsQueue.js

@@ -4,6 +4,7 @@ import { notarizationResults, dataResponses } from '../utils/stores';
 import { validateDataBatch } from '../services/validatorService';
 import { completeNotarizationJob } from '../operations/completeNotarization';
 import { decryptWithPrivateKey } from '../utils/wibson-lib/cryptography';
+import { getDataOrder } from '../operations/dataExchange';
 
 const queueName = 'NotarizationQueue';
 const defaultJobOptions = {
@@ -52,8 +53,9 @@ export const notarize = async (lockingKeyHash) => {
 
   const sellersToValidate = sellers.filter(inAgreement);
   if (sellersToValidate.length > 0) {
+    const { id } = await getDataOrder(orderId);
     const dataBatch = await prepareDataBatchForValidation(orderId, sellersToValidate);
-    await validateDataBatch(lockingKeyHash, dataBatch);
+    await validateDataBatch(id, lockingKeyHash, dataBatch);
     await notarizationResults.update(lockingKeyHash, { status: 'validating' });
   } else {
     completeNotarizationJob(lockingKeyHash);

notary-api/src/routes/data.js

@@ -12,19 +12,59 @@ const router = express.Router();
  *     description: |
  *       Receives and stores data validation results so that associated
  *       DataResponse can be closed.
+ *     parameters:
+ *        - in: body
+ *          name: validationResponse
+ *          required: true
+ *          schema:
+ *            $ref: "#/definitions/ValidationResponse"
  *     produces:
  *       - application/json
  *     responses:
  *       200:
  *         description: When validation results are registered successfully
+ *
+ * definitions:
+ *   ValidationResponse:
+ *     type: object
+ *     required:
+ *       - dataGroupId
+ *       - dataBatchId
+ *       - result
+ *     properties:
+ *       dataGroupId:
+ *        type: string
+ *        description: The unique identifier for the validation batch.
+ *       dataBatchId:
+ *        type: string
+ *        description: The unique identifier for the validation batch.
+ *       result:
+ *        type: array
+ *        description: The result validation for that batch.
+ *        items:
+ *          type: object
+ *          required:
+ *            - id
+ *            - validated
+ *            - identified
+ *          properties:
+ *            id:
+ *              type: string
+ *              description: The unique identifier for that data.
+ *            validated:
+ *              type: boolean
+ *              description: Whether the data was validated or not.
+ *            identified:
+ *              type: boolean
+ *              description: Whether the validation result was positive or not.
  */
 router.post('/validation-result', asyncError(async (req, res) => {
-  const { nonce, result } = req.body;
-  const notarization = await notarizationResults.safeFetch(nonce);
+  const { dataBatchId, result } = req.body;
+  const notarization = await notarizationResults.safeFetch(dataBatchId);
   if (!notarization) {
     res.boom.notFound('No notarization found');
   } else {
-    await completeNotarization(nonce, result);
+    await completeNotarization(dataBatchId, result);
     res.sendStatus(202);
   }
 }));

notary-api/src/services/validatorService.js

@@ -8,13 +8,14 @@ const httpsAgent = new https.Agent({
 });
 
 /**
- * @param {number} payloadID DataOrder ID in DataExchange
+ * @param {string} dataGroupId The unique identifier for the validation data group
+ * @param {string} dataBatchId The unique identifier for the validation batch
  * @param {object[]} payload Information to validate
  */
-export const validateDataBatch = async (payloadID, payload) =>
+export const validateDataBatch = async (dataGroupId, dataBatchId, payload) =>
   axios.post(
     `${config.notaryValidatorUrl}/validate`,
-    { nonce: payloadID, payload },
+    { dataGroupId, dataBatchId, payload },
     { httpsAgent },
   );
 

notary-api/test/queues/notarizationsQueue.mock.js

@@ -40,8 +40,13 @@ td.replace('../../src/queues/createQueue', {
   createQueue: sinon.stub().returns(notarizationsQueue),
 });
 
-export const completeNotarizationJob = sinon.spy();
-td.replace('../../src/operations/completeNotarization', { completeNotarizationJob });
+export const { completeNotarizationJob } = td.replace('../../src/operations/completeNotarization', {
+  completeNotarizationJob: sinon.spy(),
+});
+
+export const { getDataOrder } = td.replace('../../src/operations/dataExchange', {
+  getDataOrder: sinon.spy(dxid => ({ id: `some-uuid-for-order-${dxid}` })),
+});
 
 test.beforeEach(() => {
   decryptWithPrivateKey.returns(JSON.stringify({

notary-api/test/queues/snapshots/notarizationsQueue.test.js.md

@@ -16,6 +16,7 @@ Generated by [AVA](https://ava.li).
 ## validateDataBatch.args
 
     [
+      'some-uuid-for-order-42',
       '0x7b9a465acbec4bbce6782e7b2f00d2c6e95c49eff319f1748c1119dc9393a2f6',
       [
         {