Add feedURL to DeliveryRecord

Author: synzen

src/models/DeliveryRecord.js

@@ -6,6 +6,10 @@ const schema = new mongoose.Schema({
     type: String,
     required: true
   },
+  feedURL: {
+    type: String,
+    required: true
+  },
   channel: {
     type: String,
     required: true

src/structs/DeliveryPipeline.js

@@ -77,6 +77,7 @@ class DeliveryPipeline {
     const channel = feedObject.channel
     const data = {
       articleID: article._id,
+      feedURL: feedObject.url,
       channel,
       delivered: false,
       comment: errorMessage
@@ -97,6 +98,7 @@ class DeliveryPipeline {
     const channel = feedObject.channel
     const data = {
       articleID: article._id,
+      feedURL: feedObject.url,
       delivered: true,
       channel
     }
@@ -116,6 +118,7 @@ class DeliveryPipeline {
     const channel = feedObject.channel
     const data = {
       articleID: article._id,
+      feedURL: feedObject.url,
       channel,
       delivered: false,
       comment: 'Blocked by filters'

src/tests/structs/int_DeliveryPipeline.test.js

@@ -42,7 +42,8 @@ describe('Unit::structs/DeliveryPipeline', function () {
         _id: 'some id'
       },
       feedObject: {
-        channel: 'w4yrh5e'
+        channel: 'w4yrh5e',
+        url: 'someurl'
       }
     }
     beforeEach(() => {
@@ -63,6 +64,7 @@ describe('Unit::structs/DeliveryPipeline', function () {
       await pipeline.deliver(newArticle)
       expect(DeliveryRecord.Model).toHaveBeenCalledWith({
         articleID: newArticle.article._id,
+        feedURL: newArticle.feedObject.url,
         delivered: true,
         channel: newArticle.feedObject.channel
       })
@@ -79,6 +81,7 @@ describe('Unit::structs/DeliveryPipeline', function () {
       await pipeline.deliver(newArticle)
       expect(DeliveryRecord.Model).toHaveBeenCalledWith({
         articleID: newArticle.article._id,
+        feedURL: newArticle.feedObject.url,
         channel: newArticle.feedObject.channel,
         delivered: false,
         comment: 'Blocked by filters'
@@ -99,6 +102,7 @@ describe('Unit::structs/DeliveryPipeline', function () {
       await pipeline.deliver(newArticle)
       expect(DeliveryRecord.Model).toHaveBeenCalledWith({
         articleID: newArticle.article._id,
+        feedURL: newArticle.feedObject.url,
         channel: newArticle.feedObject.channel,
         delivered: false,
         comment: error.message

src/tests/structs/unit_DeliveryPipeline.test.js

@@ -214,13 +214,15 @@ describe('Unit::structs/DeliveryPipeline', function () {
             _id: 'abc'
           },
           feedObject: {
-            channel: 'abaa'
+            channel: 'abaa',
+            url: 'someurl'
           }
         }
         const errorMessage = '53e47yu'
         await pipeline.recordFailure(newArticle, errorMessage)
         expect(DeliveryRecord.Model).toHaveBeenCalledWith({
           articleID: newArticle.article._id,
+          feedURL: newArticle.feedObject.url,
           channel: newArticle.feedObject.channel,
           delivered: false,
           comment: errorMessage
@@ -236,12 +238,14 @@ describe('Unit::structs/DeliveryPipeline', function () {
             _id: 'abc'
           },
           feedObject: {
+            url: 'bla',
             channel: 'abaa'
           }
         }
         await pipeline.recordSuccess(newArticle)
         expect(DeliveryRecord.Model).toHaveBeenCalledWith({
           articleID: newArticle.article._id,
+          feedURL: newArticle.feedObject.url,
           channel: newArticle.feedObject.channel,
           delivered: true
         })
@@ -256,12 +260,14 @@ describe('Unit::structs/DeliveryPipeline', function () {
             _id: 'abc'
           },
           feedObject: {
-            channel: 'abaa'
+            channel: 'abaa',
+            url: 'feedurl'
           }
         }
         await pipeline.recordFilterBlock(newArticle)
         expect(DeliveryRecord.Model).toHaveBeenCalledWith({
           articleID: newArticle.article._id,
+          feedURL: newArticle.feedObject.url,
           channel: newArticle.feedObject.channel,
           delivered: false,
           comment: 'Blocked by filters'