Merge branch 'MAS-129_121__112_Daily_Email' of https://github.com/nhs…

…evidence/MAS into MAS-129_121__112_Daily_Email
nice-digital · Jan 16, 2020 · 8b643c5 · 8b643c5 · NICE-TeamCity · Jan 16, 2020
2 parents 78f6c65 + ef4e6b2
commit 8b643c5
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 15 deletions.
diff --git a/cms/models/EvidenceType.js b/cms/models/EvidenceType.js
@@ -1,6 +1,9 @@
 const keystone = require("keystone"),
 	fs = require("fs"),
-	path = require("path");
+	path = require("path"),
+	log4js = require("log4js");
+
+const logger = log4js.getLogger("Item.js");
 
 // Load the JSONLD for evidence types on application load
 // so we don't have to hit the file system again and again
@@ -10,7 +13,7 @@ fs.readFile(
 	"UTF-8",
 	function(err, contents) {
 		if (err) {
-			loggger.error(err);
+			logger.error(err);
 			throw err;
 		}
 
@@ -30,7 +33,11 @@ const EvidenceType = new keystone.List("EvidenceType", {
 EvidenceType.add({
 	title: { type: String, required: true },
 	key: { type: String, required: true },
-	oldEPiServerId: { label: "Old EPiServer ID", type: Types.Number, required: false },
+	oldEPiServerId: {
+		label: "Old EPiServer ID",
+		type: Types.Number,
+		required: false
+	}
 });
 
 EvidenceType.relationship({
@@ -47,10 +54,8 @@ EvidenceType.schema.virtual("broaderTitle").get(function() {
 	// Assume only 2 levels
 	const broaderConcept = evidenceTypes.find(e => e["@id"] === concept.broader);
 
-	if(broaderConcept.broader)
-		return broaderConcept.prefLabel["@value"];
-	else
-		return concept.prefLabel["@value"];
+	if (broaderConcept.broader) return broaderConcept.prefLabel["@value"];
+	else return concept.prefLabel["@value"];
 });
 
 EvidenceType.defaultColumns = "title, oldEPiServerId, key";

diff --git a/cms/models/Item.js b/cms/models/Item.js
@@ -95,7 +95,7 @@ Item.add({
 	staticPath: {
 		type: Types.Text,
 		watch: "title",
-		value: function () {
+		value: function() {
 			return (
 				process.env.STATIC_SITE_PATH +
 				(this.slug || utils.slug(this.title)) +
@@ -107,7 +107,7 @@ Item.add({
 	}
 });
 
-Item.schema.pre("validate", function (next) {
+Item.schema.pre("validate", function(next) {
 	if (this.isInitial) {
 		this.isInitial = false;
 		next();
@@ -152,7 +152,7 @@ const createWeeklyIfNeeded = async () => {
 };
 
 // Post save hook to trigger a lambda with the document details
-Item.schema.post("save", async function (doc, next) {
+Item.schema.post("save", async function(doc, next) {
 	await createWeeklyIfNeeded();
 
 	logger.info("Post save, sending request...", doc);

diff --git a/cms/routes/api/items.js b/cms/routes/api/items.js
@@ -5,13 +5,13 @@ const keystone = require("keystone"),
 const log4js = require("log4js"),
 	logger = log4js.getLogger();
 
-exports.single = function (req, res, next) {
+exports.single = function(req, res, next) {
 	Items.model
 		.findById(req.params.itemId)
 		.populate("source")
 		.populate("evidenceType")
 		.populate("specialities")
-		.exec(function (err, item) {
+		.exec(function(err, item) {
 			if (err) {
 				logger.error(`Error getting item with id ${req.params.itemId}`, err);
 				return res.error(err, true);
@@ -40,7 +40,8 @@ exports.single = function (req, res, next) {
 				"evidenceType._id",
 				"evidenceType.title",
 				"evidenceType.key",
-				"evidenceType.broaderTitle"]);
+				"evidenceType.broaderTitle"
+			]);
 
 			return res.json(obj);
 		});
@@ -49,14 +50,14 @@ exports.single = function (req, res, next) {
 /**
  * List Items
  */
-exports.list = function (req, res) {
+exports.list = function(req, res) {
 	// TODO: Pagination
 	Items.model
 		.find()
 		.populate("source")
 		.populate("evidenceType")
 		.populate("specialities")
-		.exec(function (err, items) {
+		.exec(function(err, items) {
 			if (err) {
 				logger.error(`Failed to get list of items`, err);
 				return res.error(err, true);