Merge article poll fix

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "reader-critics",
-	"version": "0.6.0",
+	"version": "0.6.1",
 	"license": "GPL-3.0",
 	"private": false,
 	"description": "Leserkritikk v2 (Reader Critics)",

src/app/db/common/wrapFind.ts

@@ -63,7 +63,7 @@ export function wrapFindOne <D extends Document, Z> (
 		result.exec()
 		.then((doc : D) => (doc === null) ? resolve(null) : doc.toObject())
 		.then((doc : null|Object) => {
-			if (!isObject(doc)) {
+			if (!(doc === null || isObject(doc))) {  // Explicit null-check here
 				return reject(new Error('result.exec() did not return a single object'));
 			}
 

src/app/queue/handlers/onPollArticleUpdate/notifyEnduserAboutUpdate.ts

@@ -19,7 +19,6 @@
 import * as app from 'app/util/applib';
 
 import { isEmpty } from 'lodash';
-import { EmptyError } from 'app/util/errors';
 import { translate as __ } from 'app/services/localization';
 
 import MailTemplate from 'app/template/MailTemplate';
@@ -61,23 +60,20 @@ export function notifyEnduserAboutUpdate(
 		);
 
 		if (feedbacksWithUserData.length === 0) {
-			// Flow control through exception handling is a Bad Thing™ and I have
-			// to state that here again, because I'm repeating that pattern!
-			throw new EmptyError(null);
+			return;  // No feedbacks with user data/e-mail addresses -> do nothing
 		}
 
 		// Extract user e-mail addresses
 		return Promise.all([
 			feedbacksWithUserData.map((feedback : Feedback) => feedback.enduser.email),
 			layoutNotification(website, newRevision),
 			getMailSubject(website, newRevision),
-		]);
-	})
-
-	// Put everything together und shoot the mail
-	.spread((recipients : string[], html : string, subject : string) => (
-		SendGridMailer(recipients, subject, html)
-	));
+		])
+		// Put everything together und shoot the mail
+		.spread((recipients : string[], html : string, subject : string) => (
+			SendGridMailer(recipients, subject, html)
+		));
+	});
 }
 
 // E-mail layout

src/app/services/article/ArticleDAO.ts

@@ -82,22 +82,34 @@ export function saveNewVersion(
 	website : Website,
 	newArticle : Article,
 	oldID : ObjectID
-) : Promise <Article> {
+) : PromiseLike <Article> {
 	emptyCheck(website, newArticle, oldID);
 
-	return makeDocument(website, newArticle)
-	.then(newDocument => save(website, newDocument))
-	.then(newPersisted => wrapFindOne(ArticleModel.findOneAndUpdate(
-		{ _id : oldID },
-		{
-			'$set': {
-				newerVersion: newPersisted.ID,
-			},
-		},
-		{
-			'new': true,
-		}
-	)));
+	// Try to fetch the object with the new version first, there's a chance it
+	// already exists in the database (for example if the update on the article
+	// site just happened and someone put in a feedback to that version here)
+	return get(newArticle.url, newArticle.version, false)
+	// If the article is not yet in the database, create a new Mongoose document
+	// from the schema and persists the newly fetched data
+	.then((existingArticle : Article) => (
+		(existingArticle === null)
+			? makeDocument(website, newArticle)
+				.then(newDocument => save(website, newDocument))
+			: existingArticle
+	))
+	// Now that we definitely have the object of the new revision, save its ID to
+	// the older version as a pointer to this "updated" revision
+	.then((newRevision : Article) => (
+		ArticleModel.findOneAndUpdate(
+			{ _id: oldID },
+			{
+				'$set': {
+					newerVersion: newRevision.ID,
+				},
+			}
+		)
+		.then(() => newRevision)
+	));
 }
 
 export function upsert(website : Website, article : Article) : Promise <Article> {