Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
<PackageReference Include="HtmlSanitizer" Version="6.0.453" />
<PackageReference Include="IdentityModel" Version="4.6.0" />
<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.2" />
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.49" />
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.50" />
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.19.0" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.36" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.36" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<ItemGroup>
<PackageReference Include="FluentAssertions" Version="6.12.0" />
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.49" />
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.50" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="3.1.13" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
<PackageReference Include="Selenium.Axe" Version="4.0.19" />
Expand Down
2 changes: 1 addition & 1 deletion LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
<PackageReference Include="HtmlAgilityPack" Version="1.11.72" />
<PackageReference Include="IdentityModel" Version="4.6.0" />
<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.49" />
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.50" />
<PackageReference Include="linqtotwitter" Version="6.9.0" />
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.19.0" />
<PackageReference Include="Microsoft.ApplicationInsights.EventCounterCollector" Version="2.21.0" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,14 @@
<Build Include="Stored Procedures\GetQueueRequests.sql" />
<Build Include="Stored Procedures\MessageDeliveryFailed.sql" />
<Build Include="Stored Procedures\MessageDeliverySuccess.sql" />
<Build Include="Stored Procedures\SaveFailedSingleEmail.sql" />
<Build Include="Stored Procedures\SaveSingleEmailTransactions.sql" />
<Build Include="User-Defined Table Types\QueueRequestTableType.sql" />
</ItemGroup>
<ItemGroup>
<None Include="Scripts\Post-Deploy\Scripts\RequestStatusData.sql" />
<None Include="Scripts\Post-Deploy\Scripts\RequestTypeData.sql" />
</ItemGroup>
<ItemGroup>
<PostDeploy Include="Scripts\Post-Deploy\Script.PostDeployment.sql" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
/*
Post-Deployment Script Template
--------------------------------------------------------------------------------------
This file contains SQL statements that will be appended to the build script.
Use SQLCMD syntax to include a file in the post-deployment script.
Example: :r .\myfile.sql
Use SQLCMD syntax to reference a variable in the post-deployment script.
Example: :setvar TableName MyTable
SELECT * FROM [$(TableName)]
--------------------------------------------------------------------------------------
*/

:r .\Scripts\RequestStatusData.sql
:r .\Scripts\RequestTypeData.sql
Original file line number Diff line number Diff line change
@@ -1,21 +1,22 @@
-------------------------------------------------------------------------------
-- Author Arunima George
-- Created 27-05-2025
-- Purpose Save one-off(like otp emails) failed email request.
-- Purpose Save all one-off(like otp) email request transactions.
--
-- Modification History
--
-- 27-05-2025 Arunima George Initial Revision
-------------------------------------------------------------------------------

CREATE PROCEDURE [dbo].[SaveFailedSingleEmail]
CREATE PROCEDURE [dbo].[SaveSingleEmailTransactions]
@Recipient nvarchar(255),
@TemplateId nvarchar(50),
@Personalisation nvarchar(max),
@ErrorMessage nvarchar(max)
@Personalisation nvarchar(max) = NULL,
@Status int,
@ErrorMessage nvarchar(max) = NULL
AS
BEGIN
insert into [dbo].[QueueRequests] (RequestTypeId, Recipient, TemplateId, Personalisation, Status, CreatedAt, LastAttemptAt,ErrorMessage )
values (3, @Recipient, @TemplateId, @Personalisation, 3, SYSDATETIMEOFFSET(), SYSDATETIMEOFFSET(), @ErrorMessage);
values (3, @Recipient, @TemplateId, @Personalisation, @Status, SYSDATETIMEOFFSET(), SYSDATETIMEOFFSET(), @ErrorMessage);
END
GO
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ public MessageQueueDbContextOptions Options
get { return this.options; }
}

////public virtual DbSet<QueueRequests> QueueRequests { get; set; }

/// <summary>
/// Gets or sets the PendingMessageRequests.
/// </summary>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.49" />
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.50" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.20" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.20" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@ public interface IMessageQueueRepository
Task MessageDeliverySuccess(GovNotifyResponse response);

/// <summary>
/// Save failed one-off email.
/// Save one-off emails.
/// </summary>
/// <param name="request">The email request.</param>
/// <returns>The <see cref="Task"/>.</returns>
Task SaveFailedSingleEmail(SingleEmailFailedRequest request);
Task SaveSingleEmailTransactions(SingleEmailRequest request);
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
namespace LearningHub.Nhs.MessageQueueing.Repositories
{
using System;
using System.Collections.Generic;
using System.Data;
using System.Threading.Tasks;
Expand Down Expand Up @@ -74,17 +75,18 @@ public async Task MessageDeliveryFailed(GovNotifyResponse response)
}

/// <summary>
/// The Save failed Single Emails.
/// The Save Single Emails.
/// </summary>
/// <param name="request">The request.</param>
/// <returns>The <see cref="Task"/>.</returns>
public async Task SaveFailedSingleEmail(SingleEmailFailedRequest request)
public async Task SaveSingleEmailTransactions(SingleEmailRequest request)
{
var param0 = new SqlParameter("@p0", SqlDbType.NVarChar) { Value = request.Recipient };
var param1 = new SqlParameter("@p1", SqlDbType.NVarChar) { Value = request.TemplateId };
var param2 = new SqlParameter("@p2", SqlDbType.NVarChar) { Value = request.Personalisation };
var param3 = new SqlParameter("@p3", SqlDbType.NVarChar) { Value = request.ErrorMessage };
await this.dbContext.Database.ExecuteSqlRawAsync("dbo.SaveFailedSingleEmail @p0, @p1, @p2, @p3", param0, param1, param2, param3);
var param2 = new SqlParameter("@p2", SqlDbType.NVarChar) { Value = request.Personalisation == null ? DBNull.Value : request.Personalisation };
var param3 = new SqlParameter("@p3", SqlDbType.Int) { Value = request.Status };
var param4 = new SqlParameter("@p4", SqlDbType.NVarChar) { Value = request.ErrorMessage == null ? DBNull.Value : request.ErrorMessage };
await this.dbContext.Database.ExecuteSqlRawAsync("dbo.SaveSingleEmailTransactions @p0, @p1, @p2, @p3, @p4", param0, param1, param2, param3, param4);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<ItemGroup>
<PackageReference Include="GovukNotify" Version="7.2.0" />
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.49" />
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.50" />
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.1" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.1" />
<PackageReference Include="Microsoft.Extensions.Options" Version="8.0.2" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.49" />
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.50" />
<PackageReference Include="NLog.Web.AspNetCore" Version="4.15.0" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.49" />
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.50" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.20" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<PackageReference Include="AutoMapper" Version="10.1.1" />
<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="8.1.1" />
<PackageReference Include="IdentityModel" Version="4.6.0" />
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.49" />
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.50" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.20" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.20" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.20" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

<ItemGroup>
<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.9" />
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.49" />
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.50" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<PackageReference Include="Azure.Storage.Files.Shares" Version="12.8.0" />
<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.9" />
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.49" />
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.50" />
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.1" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.1" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.1" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
using LearningHub.Nhs.MessagingService.Interfaces;
using LearningHub.Nhs.Models.Entities.GovNotifyMessaging;
using LearningHub.Nhs.Models.Entities.Messaging;
using LearningHub.Nhs.Models.Enums.GovNotifyMessaging;
using LearningHub.Nhs.Models.GovNotifyMessaging;
using LearningHub.Nhs.OpenApi.Repositories.Interface.Repositories.Messaging;
using LearningHub.Nhs.OpenApi.Services.Interface.HttpClients;
Expand Down Expand Up @@ -61,19 +62,19 @@ public async Task<GovNotifyResponse> SendEmailAsync(EmailRequest request)

response = await this.messageService.SendEmailAsync(request.Recipient, request.TemplateId, request.Personalisation);

Dictionary<string, string> test = new Dictionary<string, string>();
if (response != null)
{
if (!response.IsSuccess && (request.Id == null || request.Id <= 0))
if (request.Id == null || request.Id <= 0)
{
var failedRequest = new SingleEmailFailedRequest
var emailRequest = new SingleEmailRequest
{
Recipient = request.Recipient,
TemplateId = request.TemplateId,
Personalisation = request.Personalisation != null ? JsonConvert.SerializeObject(request.Personalisation.ToDictionary(kvp => kvp.Key, kvp => kvp.Value?.ToString())) : null,
Status = response.IsSuccess == true ? RequestStatusEnum.Sent : RequestStatusEnum.Failed,
ErrorMessage = response.ErrorMessage,
};
await this.messageQueueRepository.SaveFailedSingleEmail(failedRequest);
await this.messageQueueRepository.SaveSingleEmailTransactions(emailRequest);
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

<ItemGroup>
<PackageReference Include="FluentAssertions" Version="8.0.1" />
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.49" />
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.50" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
<PackageReference Include="Moq" Version="4.20.72" />
<PackageReference Include="NBuilder" Version="6.1.0" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<ItemGroup>
<PackageReference Include="AspNetCore.Authentication.ApiKey" Version="8.0.1" />
<PackageReference Include="IdentityServer4.AccessTokenValidation" Version="3.0.1" />
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.49" />
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.50" />
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.22.0" />
<PackageReference Include="Microsoft.ApplicationInsights.NLogTarget" Version="2.22.0" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.36" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

<ItemGroup>
<PackageReference Include="Azure.Messaging.ServiceBus" Version="7.18.3" />
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.49" />
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.50" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

<ItemGroup>
<PackageReference Include="AutoFixture" Version="4.18.1" />
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.49" />
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.50" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
<PackageReference Include="Moq" Version="4.20.72" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<PackageReference Include="AutoMapper" Version="10.1.1" />
<PackageReference Include="Azure.Messaging.ServiceBus" Version="7.18.3" />
<PackageReference Include="Azure.Storage.Blobs" Version="12.23.0" />
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.49" />
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.50" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.36" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.1" />
<PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.49" />
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.50" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

<ItemGroup>

<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.49" />
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.50" />

<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.21.0" />

Expand Down
2 changes: 1 addition & 1 deletion WebAPI/LearningHub.Nhs.API/LearningHub.Nhs.Api.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.9" />
<PackageReference Include="IdentityServer4.AccessTokenValidation" Version="3.0.1" />
<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.49" />
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.50" />
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.21.0" />
<PackageReference Include="Microsoft.AspNetCore" Version="2.3.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.36" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<ItemGroup>
<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.9" />
<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.49" />
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.50" />
<PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.9" />
<PackageReference Include="FluentAssertions" Version="8.0.1" />
<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.49" />
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.50" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.3.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
<PackageReference Include="Moq" Version="4.20.72" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="8.1.1" />
<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.9" />
<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.49" />
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.50" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.0" />
<PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<ItemGroup>
<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.9" />
<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.49" />
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.50" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.0" />
<PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<PackageReference Include="Azure.Storage.Queues" Version="12.21.0" />
<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.9" />
<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.49" />
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.50" />
<PackageReference Include="System.Data.SqlClient" Version="4.9.0" />
<PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
<PrivateAssets>all</PrivateAssets>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<PackageReference Include="EntityFrameworkCore.Testing.Moq" Version="5.0.0" />
<PackageReference Include="FluentAssertions" Version="8.0.1" />
<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.49" />
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.50" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.1" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.9" />
<PackageReference Include="FluentValidation.AspNetCore" Version="11.3.0" />
<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.49" />
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.50" />
<PackageReference Include="Microsoft.Azure.Management.DataFactory" Version="9.3.0" />
<PackageReference Include="Microsoft.Azure.Management.Media" Version="6.0.0" />
<PackageReference Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="5.3.0" />
Expand Down
Loading
Loading