Merge pull request #905 from Grommers00/user-883

Fix #883 - Add a user - ready for review. Round #2.

src/backend/data/feed.js

@@ -13,7 +13,7 @@ const hash = require('./hash');
 const urlToId = url => hash(normalizeUrl(url));
 
 class Feed {
-  constructor(author, url, link, etag, lastModified) {
+  constructor(author, url, user, link, etag, lastModified) {
     if (!url) {
       throw new Error('missing url for feed');
     }
@@ -24,7 +24,9 @@ class Feed {
     this.id = urlToId(url);
     this.author = author;
     this.url = url;
+    this.user = user;
     this.link = link;
+
     // We may or may not have these cache values when we create a feed.
     this.etag = etag === '' ? null : etag;
     this.lastModified = lastModified === '' ? null : lastModified;
@@ -80,6 +82,7 @@ class Feed {
     const feed = new Feed(
       feedData.author,
       feedData.url,
+      feedData.user,
       feedData.link,
       feedData.etag,
       feedData.lastModified
@@ -99,8 +102,7 @@ class Feed {
     if (!(data && data.id)) {
       return null;
     }
-
-    return new Feed(data.author, data.url, data.link, data.etag, data.lastModified);
+    return new Feed(data.author, data.url, data.user, data.link, data.etag, data.lastModified);
   }
 
   /**

src/backend/feed/processor.js

@@ -55,6 +55,8 @@ async function getFeedInfo(feed) {
     link: null,
     contentType: null,
     shouldDownload: true,
+    // We do not have user-info at this stage currently, once feeds get added it will include passport.js information here.
+    user: null,
   };
 
   let response;

src/backend/utils/storage.js

@@ -39,6 +39,8 @@ module.exports = {
         feed.author,
         'url',
         feed.url,
+        'user',
+        feed.user,
         'link',
         feed.link,
         'etag',

test/feed.test.js

@@ -5,17 +5,18 @@ const hash = require('../src/backend/data/hash');
 
 const urlToId = url => hash(normalizeUrl(url));
 
-describe('Fost data class tests', () => {
+describe('Post data class tests', () => {
   const data = {
     author: 'Post Author',
     url: 'https://user.feed.com/feed.rss',
+    user: 'user',
     id: urlToId('https://user.feed.com/feed.rss'),
     link: 'https://user.feed.com/',
     etag: null,
     lastModified: null,
   };
 
-  const createFeed = () => new Feed(data.author, data.url, data.link, null, null);
+  const createFeed = () => new Feed(data.author, data.url, data.user, data.link, null, null);
 
   test('Feed should be a function', () => {
     expect(typeof Feed).toBe('function');
@@ -43,6 +44,7 @@ describe('Fost data class tests', () => {
       expect(feed.url).toEqual(data.url);
       expect(feed.id).toEqual(data.id);
       expect(feed.link).toEqual(data.link);
+      expect(feed.user).toEqual(data.user);
     });
 
     test('Feed.byId() for an invalid id should return null', async () => {
@@ -57,6 +59,7 @@ describe('Fost data class tests', () => {
       expect(feed.url).toEqual(data.url);
       expect(feed.id).toEqual(data.id);
       expect(feed.link).toEqual(data.link);
+      expect(feed.user).toEqual(data.user);
     });
 
     test('Feed.byId() for an invalid url should return null', async () => {

test/feeds.test.js

@@ -33,12 +33,13 @@ describe('test /feeds/:id responses', () => {
   const missingUrl = 'http://missing-url';
 
   // an object to be added for testing purposes
-  const addedFeed = new Feed('foo', existingUrl, existingLink);
+  const addedFeed = new Feed('foo', existingUrl, 'user', existingLink);
 
   // an object, expected to be returned by a correct query
   const receivedFeed = {
     author: 'foo',
     url: existingUrl,
+    user: 'user',
     link: existingLink,
     id: hash(existingUrl),
     etag: null,
@@ -73,6 +74,7 @@ describe('test POST /feeds endpoint', () => {
     const feedData = {
       author: 'foo',
       url: 'http://telescope200.cdot.systems',
+      user: 'user',
     };
     const res = await request(app)
       .post('/feeds')
@@ -88,6 +90,7 @@ describe('test POST /feeds endpoint', () => {
   it('no author being sent', async () => {
     const feedData = {
       author: null,
+      user: 'user',
       url: 'http://telescope200.cdot.systems',
     };
     const res = await request(app)
@@ -100,6 +103,7 @@ describe('test POST /feeds endpoint', () => {
   it('no url being sent', async () => {
     const feedData = {
       author: 'foo',
+      user: 'user',
       url: null,
     };
     const res = await request(app)
@@ -113,6 +117,7 @@ describe('test POST /feeds endpoint', () => {
     const feedData = {
       author: 'foo',
       url: 'http://telescope0.cdot.systems',
+      user: 'user',
     };
     await Feed.create(feedData);
     const res = await request(app)

test/posts.test.js

@@ -72,6 +72,7 @@ describe('test /posts/:id responses', () => {
   const feed1 = new Feed(
     'Feed Author',
     'http://feed-url.com/',
+    'user',
     'https://feed-link.com/',
     null,
     null
@@ -118,6 +119,7 @@ describe('test /posts/:id responses', () => {
     // Create a feed
     const feedId = await Feed.create({
       author: 'Feed Author',
+      user: 'user',
       url: 'https://feed-url.com/',
     });
     const feed = await Feed.byId(feedId);

test/storage.test.js

@@ -13,12 +13,13 @@ const Feed = require('../src/backend/data/feed');
 const hash = require('../src/backend/data/hash');
 
 describe('Storage tests for feeds', () => {
-  const feed1 = new Feed('James Smith', 'http://seneca.co/jsmith');
-  const feed2 = new Feed('James Smith 2', 'http://seneca.co/jsmith/2');
-  const feed3 = new Feed('James Smith 2', 'http://seneca.co/jsmith/3', null, 'etag');
+  const feed1 = new Feed('James Smith', 'http://seneca.co/jsmith', 'user');
+  const feed2 = new Feed('James Smith 2', 'http://seneca.co/jsmith/2', 'user');
+  const feed3 = new Feed('James Smith 2', 'http://seneca.co/jsmith/3', 'user', null, 'etag');
   const feed4 = new Feed(
     'James Smith 2',
     'http://seneca.co/jsmith/4',
+    'user',
     'http://seneca.co/jsmith',
     'etag',
     'last-modified'
@@ -33,6 +34,7 @@ describe('Storage tests for feeds', () => {
     expect(feed.url).toEqual(feed1.url);
     expect(feed.etag).toEqual('');
     expect(feed.lastModified).toEqual('');
+    expect(feed.user).toEqual(feed1.user);
   });
 
   it('should return expected feed count', async () => {

tools/add-feed.js

@@ -18,14 +18,16 @@ async function add() {
     log.error('Usage: add-feed --name <name of the blog author> --url <the feed of the url>');
     process.exit(1);
   }
-  const { name, url, link } = args;
+
+  const { name, url, user, link } = args;
+
   if (!isValidUrl(url)) {
     log.error('INVALID URL');
     process.exit(1);
   }
 
   try {
-    await Feed.create({ author: name, url, link });
+    await Feed.create({ author: name, url, user, link });
     process.exit(0);
   } catch (err) {
     process.exit(1);