MAS-129 Daily email all fields no branding

cms/models/Item.js

@@ -156,6 +156,7 @@ Item.schema.post("save", async function(doc, next) {
 			.model.findById(doc._id)
 			.populate("source")
 			.populate("evidenceType")
+			.populate("speciality")
 			.exec();
 	} catch (err) {
 		logger.error("An error occurred finding item: ", err.message);

cms/routes/api/items.js

@@ -7,6 +7,7 @@ exports.single = function(req, res) {
 		.findById(req.params.itemId)
 		.populate("source")
 		.populate("evidenceType")
+		.populate("speciality")
 		.exec(function(err, item) {
 			if (err) return res.err(err);
 
@@ -25,6 +26,7 @@ exports.list = function(req, res) {
 		.find()
 		.populate("source")
 		.populate("evidenceType")
+		.populate("speciality")
 		.exec(function(err, items) {
 			if (err) return res.json({ err: err });
 

lambda/MAS.Tests/Feeds/multiple-items.json

@@ -16,7 +16,18 @@
     "publicationDate": "2019-11-25T13:48:36.000Z",
     "createdDate": "2019-10-22T15:05:05.927Z",
     "speciality": [
-      "5daf1a5c8a34d485cb05b5ba"
+      {
+        "_id": "5e0e4331200a585f718e1ee5",
+        "key": "be1c2e2f-745e-4a82-b5aa-d4cef4d31a1b",
+        "title": "Anaesthesia and pain",
+        "__v": 0
+      },
+      {
+        _id: "5e0e4331200a58dead8e1ee8",
+        key: "53fc67a4-46d8-4171-9447-7fcf216c8749",
+        title: "Complementary and alternative therapies",
+        __v: 0
+      }
     ],
     "evidenceType": {
       "_id": "5df7abf383138898ee1f67ef",
@@ -44,7 +55,18 @@
     "publicationDate": "2019-11-23T13:48:36.000Z",
     "createdDate": "2019-10-23T10:38:43.000Z",
     "speciality": [
-      "5daf1a5c8a34d478fd05b5d4"
+      {
+        "_id": "5e0e4331200a585f718e1ee5",
+        "key": "be1c2e2f-745e-4a82-b5aa-d4cef4d31a1b",
+        "title": "Anaesthesia and pain",
+        "__v": 0
+      },
+      {
+        _id: "5e0e4331200a58dead8e1ee8",
+        key: "53fc67a4-46d8-4171-9447-7fcf216c8749",
+        title: "Complementary and alternative therapies",
+        __v: 0
+      }
     ],
     "evidenceType": {
       "_id": "5df7abf383138898ee1f67ef",
@@ -72,7 +94,18 @@
     "publicationDate": "2019-10-23T00:00:00.000Z",
     "createdDate": "2019-10-23T10:56:40.000Z",
     "speciality": [
-      "5daf1a5c8a34d4d6e505b5b9"
+      {
+        "_id": "5e0e4331200a585f718e1ee5",
+        "key": "be1c2e2f-745e-4a82-b5aa-d4cef4d31a1b",
+        "title": "Anaesthesia and pain",
+        "__v": 0
+      },
+      {
+        _id: "5e0e4331200a58dead8e1ee8",
+        key: "53fc67a4-46d8-4171-9447-7fcf216c8749",
+        title: "Complementary and alternative therapies",
+        __v: 0
+      }
     ],
     "evidenceType": {
       "_id": "5df7abf383138898ee1f67ef",
@@ -100,7 +133,18 @@
     "publicationDate": "2019-10-28T00:00:00.000Z",
     "createdDate": "2019-10-28T11:07:11.000Z",
     "speciality": [
-      "5daf1a5c8a34d485cb05b5ba"
+      {
+        "_id": "5e0e4331200a585f718e1ee5",
+        "key": "be1c2e2f-745e-4a82-b5aa-d4cef4d31a1b",
+        "title": "Anaesthesia and pain",
+        "__v": 0
+      },
+      {
+        _id: "5e0e4331200a58dead8e1ee8",
+        key: "53fc67a4-46d8-4171-9447-7fcf216c8749",
+        title: "Complementary and alternative therapies",
+        __v: 0
+      }
     ],
     "evidenceType": {
       "_id": "5df7abf383138898ee1f67ef",

lambda/MAS.Tests/IntergrationTests/ContentControllerTests.PutCMSItemSavesItemIntoS3.approved.txt

@@ -2,6 +2,6 @@ Title: Some title
 Short Summary: Wonder drug
 Source: The Journal of Medicine
 Evidence Type: Safety alerts
-UKMI Comment: UKMI Comment
+UKMI Comment: SPS Comment
 Resource Links: <p><a title="Link 1" href="items/5de65fe432281d43fbfcd15a">Link 1</a></p>
 <p><a title="sadada" href="items/5de65fe432281d43fbfcd15a">Link 2</a></p>

lambda/MAS.Tests/IntergrationTests/ContentControllerTests.cs

@@ -43,7 +43,7 @@ public async Task PutCMSItemSavesItemIntoS3()
                     Key = "mas_evidence_types:Safety%20alerts",
                     Title = "Safety alerts"
                 },
-                UKMiComment = "UKMI Comment",
+                Comment = "SPS Comment",
                 ResourceLinks = "<p><a title=\"Link 1\" href=\"items/5de65fe432281d43fbfcd15a\">Link 1</a></p>\r\n<p><a title=\"sadada\" href=\"items/5de65fe432281d43fbfcd15a\">Link 2</a></p>"
             };
 

lambda/MAS.Tests/UnitTests/DailyEmailTests.CanCreateEmailWithTwoItemsDifferentEvidenceType.approved.txt

@@ -0,0 +1 @@
+<div class='evidenceType'><strong>Some evidence type</strong><div class='item'>Some Title<br>Some source<br>Some speciality<br>Some short summary<br><a href='https://www.medicinesresources.nhs.uk/abc'>SPS Comment</a></div></div><div class='evidenceType'><strong>Some evidence type 2</strong><div class='item'>Some Title<br>Some source<br>Some speciality 2<br>Some short summary<br><a href='https://www.medicinesresources.nhs.uk/abc'>SPS Comment</a></div></div>

lambda/MAS.Tests/UnitTests/DailyEmailTests.CanCreateEmailWithTwoItemsSharingEvidenceType.approved.txt

@@ -0,0 +1 @@
+<div class='evidenceType'><strong>Some evidence type</strong><div class='item'>Some Title<br>Some source<br>Some speciality<br>Some short summary<br><a href='https://www.medicinesresources.nhs.uk/abc'>SPS Comment</a></div><div class='item'>Some Title<br>Some source<br>Some speciality<br>Some short summary<br><a href='https://www.medicinesresources.nhs.uk/abc'>SPS Comment</a></div></div>

lambda/MAS.Tests/UnitTests/DailyEmailTests.CanCreateSingleItemEmail.approved.txt

@@ -0,0 +1 @@
+<div class='evidenceType'><strong>Some evidence type</strong><div class='item'>Some Title<br>Some source<br>Some speciality<br>Some short summary<br><a href='https://www.medicinesresources.nhs.uk/abc'>SPS Comment</a></div></div>

lambda/MAS.Tests/UnitTests/DailyEmailTests.ItemsWithManySpecialitiesRenderCorrectly.approved.txt

@@ -0,0 +1 @@
+<div class='evidenceType'><strong>Some evidence type</strong><div class='item'>Some Title<br>Some source<br>Some speciality | Another speciality<br>Some short summary<br><a href='https://www.medicinesresources.nhs.uk/abc'>SPS Comment</a></div></div>

lambda/MAS.Tests/UnitTests/DailyEmailTests.cs

@@ -0,0 +1,139 @@
+using MAS.Models;
+using MAS.Tests.Infrastructure;
+using Shouldly;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace MAS.Tests.UnitTests
+{
+    public class DailyEmailTests : TestBase
+    {
+        Item exampleItem = new Item()
+        {
+            Id = "123",
+            Title = "Some Title",
+            Slug = "abc",
+            ShortSummary = "Some short summary",
+            ResourceLinks = "",
+            Comment = "",
+            Speciality = new List<Speciality>
+                {
+                    new Speciality()
+                    {
+                        Key = "1a",
+                        Title = "Some speciality",
+
+                    }
+                },
+            EvidenceType = new EvidenceType()
+            {
+                Key = "1b",
+                Title = "Some evidence type"
+            },
+            Source = new Source()
+            {
+                Id = "1c",
+                Title = "Some source"
+            }
+        };
+        Item exampleItem2 = new Item()
+        {
+            Id = "123",
+            Title = "Some Title",
+            Slug = "abc",
+            ShortSummary = "Some short summary",
+            ResourceLinks = "",
+            Comment = "",
+            Speciality = new List<Speciality>
+            {
+                    new Speciality()
+                    {
+                        Key = "1a",
+                        Title = "Some speciality 2",
+
+                    }
+            },
+            EvidenceType = new EvidenceType()
+            {
+                Key = "1c",
+                Title = "Some evidence type 2"
+            },
+            Source = new Source()
+            {
+                Id = "1c",
+                Title = "Some source"
+            }
+        };
+
+        [Fact]
+        public void CanCreateSingleItemEmail()
+        {
+            var email = new DailyEmail()
+            {
+                Items = new List<Item>()
+                {
+                    exampleItem
+                }
+            };
+
+            var expectedHtml = "<div class='evidenceType'><strong>Some evidence type</strong><div class='item'>Some Title<br>Some source<br>Some speciality<br>Some short summary<br><a href='https://www.medicinesresources.nhs.uk/abc'>SPS Comment</a></div></div>";
+
+            expectedHtml.ShouldMatchApproved(email.HTML);
+
+        }
+
+        [Fact]
+        public void CanCreateEmailWithTwoItemsSharingEvidenceType()
+        {
+            var email = new DailyEmail()
+            {
+                Items = new List<Item>()
+                {
+                    exampleItem,
+                    exampleItem
+                }
+            };
+
+            var expectedHtml = "<div class='evidenceType'><strong>Some evidence type</strong><div class='item'>Some Title<br>Some source<br>Some speciality<br>Some short summary<br><a href='https://www.medicinesresources.nhs.uk/abc'>SPS Comment</a></div><div class='item'>Some Title<br>Some source<br>Some speciality<br>Some short summary<br><a href='https://www.medicinesresources.nhs.uk/abc'>SPS Comment</a></div></div>";
+            expectedHtml.ShouldMatchApproved(email.HTML);
+
+        }
+
+        [Fact]
+        public void CanCreateEmailWithTwoItemsDifferentEvidenceType()
+        {
+            var email = new DailyEmail()
+            {
+                Items = new List<Item>()
+                {
+                    exampleItem,
+                    exampleItem2
+                }
+            };
+
+            var expectedHtml = "<div class='evidenceType'><strong>Some evidence type</strong><div class='item'>Some Title<br>Some source<br>Some speciality<br>Some short summary<br><a href='https://www.medicinesresources.nhs.uk/abc'>SPS Comment</a></div></div><div class='evidenceType'><strong>Some evidence type 2</strong><div class='item'>Some Title<br>Some source<br>Some speciality 2<br>Some short summary<br><a href='https://www.medicinesresources.nhs.uk/abc'>SPS Comment</a></div></div>";
+            expectedHtml.ShouldMatchApproved(email.HTML);
+
+        }
+
+        [Fact]
+        public void ItemsWithManySpecialitiesRenderCorrectly()
+        {
+            exampleItem.Speciality.Add(new Speciality() { Key = "abcd", Title = "Another speciality" });
+            var email = new DailyEmail()
+            {
+                Items = new List<Item>()
+                {
+                    exampleItem
+                }
+            };
+
+            var expectedHtml = "<div class='evidenceType'><strong>Some evidence type</strong><div class='item'>Some Title<br>Some source<br>Some speciality | Another speciality<br>Some short summary<br><a href='https://www.medicinesresources.nhs.uk/abc'>SPS Comment</a></div></div>";
+            expectedHtml.ShouldMatchApproved(email.HTML);
+
+        }
+    }
+}

lambda/MAS/Controllers/MailController.cs

@@ -25,7 +25,7 @@ public async Task<IActionResult> PutMailAsync()
         {
             var items = await _contentService.GetItemsAsync();
 
-            var body = _mailService.CreateEmailBody(items);
+            var body = _mailService.CreateDailyEmailBody(items);
             var subject = "MAS Email";
             var previewText = "This MAS email was created " + DateTime.Now.ToShortDateString();
 

lambda/MAS/Models/DailyEmail.cs

@@ -0,0 +1,57 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MAS.Models
+{
+    public class DailyEmail
+    {
+        public List<Item> Items { get; set; }
+
+        public List<IGrouping<string, Item>> GroupedItems
+        {
+            get
+            {
+                return Items.GroupBy(x => x.EvidenceType.Title).ToList();
+            }
+        }
+
+
+        public string HTML
+        {
+            get
+            {
+                var body = new StringBuilder();
+
+                foreach (var group in GroupedItems)
+                {
+                    var evidenceType = group.Key;
+
+                    body.Append("<div class='evidenceType'>");
+                    body.Append("<strong>" + evidenceType + "</strong>");
+
+                    foreach(var item in group)
+                    {
+                        body.Append("<div class='item'>");
+                        body.Append(item.Title);
+                        body.Append("<br>");
+                        body.Append(item.Source.Title);
+                        body.Append("<br>");
+                        body.Append(String.Join(" | ", item.Speciality.Select(x => x.Title)));
+                        body.Append("<br>");
+                        body.Append(item.ShortSummary);
+                        body.Append("<br>");
+                        body.Append("<a href='https://www.medicinesresources.nhs.uk/" + @item.Slug + "'>SPS Comment</a>");
+                        body.Append("</div>");
+                    }
+
+                    body.Append("</div>");
+                }
+
+                return body.ToString();
+            }
+        }
+    }
+}

lambda/MAS/Models/Item.cs

@@ -1,4 +1,5 @@
 using Newtonsoft.Json;
+using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 
 namespace MAS.Models
@@ -7,14 +8,18 @@ public class Item
     {
         [JsonProperty("_id"), Required, JsonRequired]
         public string Id { get; set; }
+        [JsonProperty("slug")]
+        public string Slug { get; set; }
         [Required, JsonRequired]
         public string Title { get; set; }
         [Required, JsonRequired]
         public Source Source { get; set; }
         [Required, JsonRequired]
         public EvidenceType EvidenceType { get; set; }
+        [JsonProperty("speciality")]
+        public List<Speciality> Speciality { get; set; }
         public string ShortSummary { get; set; }
-        public string UKMiComment { get; set; }
+        public string Comment { get; set; }
         public string ResourceLinks { get; set; }
     }
 }

lambda/MAS/Models/Speciality.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace MAS.Models
+{
+    public class Speciality
+    {
+        public string Title { get; set; }
+
+        public string Key { get; set; }
+    }
+}