DailyEmail
+ + +
+ Safety alerts
+
+
+
diff --git a/lambda/MAS.Tests/IntegrationTests/DailyEmailTests.EmailBodyHtmlMatchesApprovedForSingleItem.approved.txt b/lambda/MAS.Tests/IntegrationTests/DailyEmailTests.EmailBodyHtmlMatchesApprovedForSingleItem.approved.txt
new file mode 100644
index 00000000..634797a8
--- /dev/null
+++ b/lambda/MAS.Tests/IntegrationTests/DailyEmailTests.EmailBodyHtmlMatchesApprovedForSingleItem.approved.txt
@@ -0,0 +1,20 @@
+
+
+ Wonder Drug
+
+ ACP Journal Club +
+ Anaesthesia and pain | Complementary and alternative therapies +
+ testing +
+ SPS Comment +
+ + ACP Journal Club +
+ Anaesthesia and pain | Complementary and alternative therapies +
+ testing +
+ SPS Comment +
+ MY MEDICINE
+
+ ADHD Awareness Month +
+ Anaesthesia and pain | Complementary and alternative therapies +
+ this is my medicine +
+ SPS Comment +
+ + ADHD Awareness Month +
+ Anaesthesia and pain | Complementary and alternative therapies +
+ this is my medicine +
+ SPS Comment +
+ Hello world
+
+ Substance Misuse Management in General Practice +
+ Anaesthesia and pain | Complementary and alternative therapies +
+ test +
+ SPS Comment +
+ + Substance Misuse Management in General Practice +
+ Anaesthesia and pain | Complementary and alternative therapies +
+ test +
+ SPS Comment +
+ A Placebo
+
+ Journal of Surgical Oncology +
+ Anaesthesia and pain | Complementary and alternative therapies +
+ hello +
+ SPS Comment +
+ + Journal of Surgical Oncology +
+ Anaesthesia and pain | Complementary and alternative therapies +
+ hello +
+ SPS Comment +
DailyEmail
+ + +
+ Safety alerts
+
+
+
diff --git a/lambda/MAS.Tests/IntegrationTests/DailyEmailTests.EmailBodyHtmlMatchesApprovedForSingleItemWithSpecificDate.approved.txt b/lambda/MAS.Tests/IntegrationTests/DailyEmailTests.EmailBodyHtmlMatchesApprovedForSingleItemWithSpecificDate.approved.txt
new file mode 100644
index 00000000..634797a8
--- /dev/null
+++ b/lambda/MAS.Tests/IntegrationTests/DailyEmailTests.EmailBodyHtmlMatchesApprovedForSingleItemWithSpecificDate.approved.txt
@@ -0,0 +1,20 @@
+
+
+ Wonder Drug
+
+ ACP Journal Club +
+ Anaesthesia and pain | Complementary and alternative therapies +
+ testing +
+ SPS Comment +
+ + ACP Journal Club +
+ Anaesthesia and pain | Complementary and alternative therapies +
+ testing +
+ SPS Comment +
DailyEmail
+ + +
+ Safety alerts
+
+
+
diff --git a/lambda/MAS.Tests/IntegrationTests/DailyEmailTests.cs b/lambda/MAS.Tests/IntegrationTests/DailyEmailTests.cs
new file mode 100644
index 00000000..363780a9
--- /dev/null
+++ b/lambda/MAS.Tests/IntegrationTests/DailyEmailTests.cs
@@ -0,0 +1,121 @@
+using MailChimp.Net.Core;
+using MailChimp.Net.Interfaces;
+using MailChimp.Net.Models;
+using MAS.Configuration;
+using MAS.Models;
+using MAS.Services;
+using MAS.Tests.Infrastructure;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Controllers;
+using Microsoft.AspNetCore.Mvc.Testing;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.AspNetCore.TestHost;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
+using Microsoft.Extensions.Logging;
+using Moq;
+using Shouldly;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Web.Mvc;
+using Xunit;
+using Source = MAS.Models.Source;
+
+namespace MAS.Tests.IntegrationTests
+{
+ public class TestMailService : IMailService
+ {
+ public Task
+ Wonder Drug
+
+ ACP Journal Club +
+ Anaesthesia and pain | Complementary and alternative therapies +
+ testing +
+ SPS Comment +
+ + ACP Journal Club +
+ Anaesthesia and pain | Complementary and alternative therapies +
+ testing +
+ SPS Comment +
Vitamin D and Health Outcomes - Then Came the Randomized Clinical Trials
\r\n" + + }; + + [Fact] + public async Task PutCMSItemSavesItemIntoS3() + { + // Arrange + var fakeS3Service = new MockVitamin D and Health Outcomes - Then Came the Randomized Clinical Trials
\r\n" - - }; - - var content = new StringContent(JsonConvert.SerializeObject(item), Encoding.UTF8, "application/json"); - - //Act - var response = await _client.PutAsync("/api/content/", content); - - // Assert - response.StatusCode.ShouldBe(System.Net.HttpStatusCode.OK); - - using (var bucketItem = await s3Client.GetObjectAsync(AppSettings.AWSConfig.BucketName, "Effect-of-vit-d.html")) - { - using (StreamReader reader = new StreamReader(bucketItem.ResponseStream)) - { - string contents = reader.ReadToEnd(); - contents.ShouldMatchApproved(); - } - } - } - - } -} diff --git a/lambda/MAS.Tests/IntergrationTests/MailControllerTests.cs b/lambda/MAS.Tests/IntergrationTests/MailControllerTests.cs deleted file mode 100644 index 096ce967..00000000 --- a/lambda/MAS.Tests/IntergrationTests/MailControllerTests.cs +++ /dev/null @@ -1,45 +0,0 @@ -using System.Threading.Tasks; -using Xunit; -using Shouldly; -using MAS.Tests.Infrastructure; -using System.Text; -using System; -using MAS.Configuration; -using System.Net.Http.Headers; -using System.Net.Http; -using MailChimp.Net.Models; -using Newtonsoft.Json; - -namespace MAS.Tests.IntergrationTests.Mail -{ - public class MailControllerTests : TestBase - { - [Fact] - public async Task PutRequestCreatesAndSendsCampaign() - { - //Arrange - const string mailChimpCampaignsURI = "https://us5.api.mailchimp.com/3.0/campaigns/"; - AppSettings.CMSConfig = TestAppSettings.GetMultipleItemsFeed(); - - var authValue = new AuthenticationHeaderValue("Basic", Convert.ToBase64String(Encoding.UTF8.GetBytes($"anystring:{AppSettings.MailConfig.ApiKey}"))); - var client = new HttpClient() - { - DefaultRequestHeaders = { Authorization = authValue } - }; - - //Act - var response = await _client.PutAsync("/api/mail/daily", null); - - //Get campaign to check if it saved - var campaignId = await response.Content.ReadAsStringAsync(); - var campaign = await client.GetAsync(mailChimpCampaignsURI + campaignId); - var campaignJson = await campaign.Content.ReadAsStringAsync(); - var campaignResult = JsonConvert.DeserializeObject"); - body.Append(item.Title); - body.Append("
"); - body.Append(item.ShortSummary); - body.Append("
"); - } - - return body.ToString(); - } } } diff --git a/lambda/MAS/Views/DailyEmail.cshtml b/lambda/MAS/Views/DailyEmail.cshtml new file mode 100644 index 00000000..f9e2fbde --- /dev/null +++ b/lambda/MAS/Views/DailyEmail.cshtml @@ -0,0 +1,156 @@ +@using MAS.Models; +@model List
+
|
+
|---|
+ @evidenceType+ |
+
+
|
+
|---|
+
|
+
|---|
+ @evidenceType+ |
+
+
|
+
|---|
+
|
+
+ 
+