Merge pull request #34 from dan-nobel/main

Communication tokens link handling fix

Author: ramogens-OS2

Valghalla.Application/Communication/ICommunicationHelper.cs

@@ -2,7 +2,7 @@
 {
     public interface ICommunicationHelper
     {
-        string ReplaceTokens(string template, CommunicationRelatedInfo info);
+        string ReplaceTokens(string template, CommunicationRelatedInfo info, bool htmlFormatLinks);
         Task<bool> ValidateTaskInvitationAsync(Guid participantId, Guid taskAssignmentId, CancellationToken cancellationToken);
         Task<bool> ValidateRemovedFromTaskAsync(Guid participantId, Guid taskAssignmentId, CancellationToken cancellationToken);
         Task<bool> ValidateRemovedFromTaskByValidationAsync(Guid participantId, Guid taskAssignmentId, CancellationToken cancellationToken);

Valghalla.Integration/Communication/CommunicationHelper.cs

@@ -1,4 +1,6 @@
-using Valghalla.Application.Communication;
+using System;
+using System.Security.Policy;
+using Valghalla.Application.Communication;
 using Valghalla.Application.Tenant;
 
 namespace Valghalla.Integration.Communication
@@ -174,14 +176,25 @@ public async Task<bool> ValidateTaskInvitationRetractedAsync(Guid taskAssignment
             return true;
         }
 
-        public string ReplaceTokens(string template, CommunicationRelatedInfo info)
+        public string ReplaceTokens(string template, CommunicationRelatedInfo info, bool htmlFormatLinks)
         {
             if (string.IsNullOrEmpty(template)) return string.Empty;
 
             var externalWebLink = tenantContextProvider.CurrentTenant.ExternalDomain;
             var contactLink = tenantContextProvider.CurrentTenant.ExternalDomain + "/kontakt-os";
             var invitationLink = tenantContextProvider.CurrentTenant.ExternalDomain + $"/opgaver/invitation/{info.HashValue}/{info.InvitationCode ?? Guid.Empty}";
 
+            var externalWebLinkHTML = externalWebLink;
+            var contactLinkHTML = contactLink;
+            var invitationLinkHTML = invitationLink;
+
+            if (htmlFormatLinks)
+            {
+                externalWebLinkHTML = "<a href=\"" + externalWebLink + "\">" + externalWebLink + "</a>";
+                contactLinkHTML = "<a href=\"" + contactLink + "\">" + contactLink + "</a>";
+                invitationLinkHTML = "<a href=\"" + invitationLink + "\">" + invitationLink + "</a>";
+            }
+            
             return template
                 .Replace("!name", info.Participant.Name)
                 .Replace("!election", info.ElectionTitle)
@@ -195,9 +208,9 @@ public string ReplaceTokens(string template, CommunicationRelatedInfo info)
                 .Replace("!payment", info.TaskType.Payment.HasValue ? info.TaskType.Payment.ToString() : string.Empty)
                 .Replace("!days", (info.TaskDate - DateTime.UtcNow).Days.ToString())
                 .Replace("!municipality", info.MunicipalityName)
-                .Replace("!invitation", invitationLink)
-                .Replace("!contact", contactLink)
-                .Replace("!external_web", externalWebLink);
+                .Replace("!invitation", invitationLinkHTML)
+                .Replace("!contact", contactLinkHTML)
+                .Replace("!external_web", externalWebLinkHTML);
         }
 
         private static string PadTimeValue(int value) => value.ToString().PadLeft(2, '0');

Valghalla.Integration/Communication/CommunicationService.cs

@@ -1,4 +1,5 @@
-using Valghalla.Application.Communication;
+using SF1601;
+using Valghalla.Application.Communication;
 using Valghalla.Application.Configuration;
 using Valghalla.Application.Queue;
 using Valghalla.Application.Queue.Messages;
@@ -172,8 +173,13 @@ private async Task<Guid> WriteCommunicationLogAsync(Guid participantId, Guid tas
 
         private async Task<Guid> WriteCommunicationLogAsync(CommunicationRelatedInfo info, Guid participantId, CommunicationLogSendType sendType, int templateType, string templateSubject, string templateContent, CancellationToken cancellationToken)
         {
-            var subject = communicationHelper.ReplaceTokens(templateSubject, info);
-            var content = communicationHelper.ReplaceTokens(templateContent, info);
+            bool htmlFormatLinks = true;
+            if (templateType == TemplateType.SMS)
+                htmlFormatLinks = false;
+
+
+            var subject = communicationHelper.ReplaceTokens(templateSubject, info, htmlFormatLinks);
+            var content = communicationHelper.ReplaceTokens(templateContent, info, htmlFormatLinks);
 
             if (templateType == TemplateType.DigitalPost)
             {

Valghalla.Worker/Services/TaskCommunicationService.cs

@@ -165,8 +165,12 @@ public async Task SendGroupMessageAsync(Guid logId, Guid participantId, Guid tas
             var info = await (isRejectedTask ? communicationQueryRepository.GetRejectedTaskInfoAsync(taskAssignmentId, cancellationToken) : communicationQueryRepository.GetCommunicationRelatedInfoAsync(participantId, taskAssignmentId, cancellationToken))
                 ?? (isRejectedTask ? throw new Exception($"Errors occurred when fetching rejected task related information (taskId = {taskAssignmentId})") : throw new Exception($"Errors occurred when fetching assigned task related information (taskId = {taskAssignmentId})"));
 
-            var subject = communicationHelper.ReplaceTokens(templateSubject, info);
-            var content = communicationHelper.ReplaceTokens(templateContent, info);
+            bool htmlFormatLinks = true;
+            if(templateType == TemplateType.SMS)
+                htmlFormatLinks = false;
+
+            var subject = communicationHelper.ReplaceTokens(templateSubject, info, htmlFormatLinks);
+            var content = communicationHelper.ReplaceTokens(templateContent, info, htmlFormatLinks);
 
             if (templateType == TemplateType.DigitalPost)
             {
@@ -191,8 +195,12 @@ private async Task SendAsync(Guid logId, Guid participantId, Guid taskAssignment
             var info = await communicationQueryRepository.GetCommunicationRelatedInfoAsync(participantId, taskAssignmentId, cancellationToken)
                 ?? throw new Exception($"Errors occurred when fetching task related information (taskAssignmentId = {taskAssignmentId})");
 
-            var subject = communicationHelper.ReplaceTokens(template.Subject, info);
-            var content = communicationHelper.ReplaceTokens(template.Content, info);
+            bool htmlFormatLinks = true;
+            if (template.TemplateType == TemplateType.SMS)
+                htmlFormatLinks = false;
+
+            var subject = communicationHelper.ReplaceTokens(template.Subject, info, htmlFormatLinks);
+            var content = communicationHelper.ReplaceTokens(template.Content, info, htmlFormatLinks);
 
             if (template.TemplateType == TemplateType.DigitalPost)
             {