Feature/508 notification with resource

src/Altinn.Notifications.Core/Integrations/IProfileClient.cs

@@ -13,4 +13,12 @@ public interface IProfileClient
     /// <param name="nationalIdentityNumbers">A list of national identity numbers to look up contact points for</param>
     /// <returns>A list of contact points for the provided national identity numbers </returns>
     public Task<List<UserContactPoints>> GetUserContactPoints(List<string> nationalIdentityNumbers);
+
+    /// <summary>
+    /// Retrieves the user registered contact points for a list of organization corresponding to a list of organization numbers
+    /// </summary>
+    /// <param name="organizationNumbers">The set or organizations to retrieve contact points for</param>
+    /// <param name="resourceId">The id of the resource to look up contact points for</param>
+    /// <returns>A list of organiation contact points containing user registered contact points</returns>
+    public Task<List<OrganizationContactPoints>> GetUserRegisteredContactPoints(List<string> organizationNumbers, string resourceId);
 }

src/Altinn.Notifications.Core/Models/Orders/IBaseNotificationOrder.cs

@@ -32,6 +32,11 @@ public interface IBaseNotificationOrder
     /// </summary>
     public bool IgnoreReservation { get; }
 
+    /// <summary>
+    /// Gets or sets the id of the resource that the notification is related to
+    /// </summary>
+    public string? ResourceId { get; }
+
     /// <summary>
     /// Gets the creator of the notification
     /// </summary>

src/Altinn.Notifications.Core/Models/Orders/NotificationOrder.cs

@@ -25,6 +25,9 @@
     /// <inheritdoc/>>    
     public bool IgnoreReservation { get; internal set; }
 
+    /// <inheritdoc/>>
+    public string? ResourceId { get; internal set; }
+
     /// <inheritdoc/>>
     public Creator Creator { get; internal set; }
 
@@ -44,7 +47,7 @@
     /// <summary>
     /// Initializes a new instance of the <see cref="NotificationOrder"/> class.
     /// </summary>
     public NotificationOrder(
         Guid id,
         string? sendersReference,
         List<INotificationTemplate> templates,
@@ -53,7 +56,8 @@
         Creator creator,
         DateTime created,
         List<Recipient> recipients,
-        bool ignoreReservation)
+        bool ignoreReservation, 
+        string? resourceId)
     {
         Id = id;
         SendersReference = sendersReference;
@@ -64,6 +68,7 @@
         Created = created;
         Recipients = recipients;
         IgnoreReservation = ignoreReservation;
+        ResourceId = resourceId;
     }
 
     /// <summary>

src/Altinn.Notifications.Core/Models/Orders/NotificationOrderRequest.cs

@@ -39,21 +39,27 @@
     public Creator Creator { get; internal set; }
 
     /// <summary>
-    /// Gets or sets whether notifications generated by this order should ignore KRR reservations
+    /// Gets a boolean indicating whether notifications generated by this order should ignore KRR reservations
     /// </summary>
     public bool IgnoreReservation { get; internal set; }
 
+    /// <summary>
+    /// Gets the id of the resource that the notification is related to
+    /// </summary>
+    public string? ResourceId { get; internal set; }
+
     /// <summary>
     /// Initializes a new instance of the <see cref="NotificationOrderRequest"/> class.
     /// </summary>
     public NotificationOrderRequest(
         string? sendersReference, 
         string creatorShortName, 
         List<INotificationTemplate> templates, 
         DateTime requestedSendTime, 
         NotificationChannel notificationChannel,
         List<Recipient> recipients,
-        bool ignoreReservation = false)
+        bool ignoreReservation = false,
+        string? resourceId = null)
     {
         SendersReference = sendersReference;
         Creator = new(creatorShortName);
@@ -62,6 +68,7 @@
         NotificationChannel = notificationChannel;
         Recipients = recipients;
         IgnoreReservation = ignoreReservation;
+        ResourceId = resourceId;
     }
 
     /// <summary>

src/Altinn.Notifications.Core/Models/Orders/NotificationOrderWithStatus.cs

@@ -30,6 +30,9 @@ public class NotificationOrderWithStatus : IBaseNotificationOrder
     /// <inheritdoc/>>
     public bool IgnoreReservation { get; internal set; }
 
+    /// <inheritdoc/>>
+    public string? ResourceId { get; internal set; }
+
     /// <summary>
     /// Gets the processing status of the notication order
     /// </summary>

src/Altinn.Notifications.Core/Services/ContactPointService.cs

@@ -14,21 +14,24 @@ public class ContactPointService : IContactPointService
     {
         private readonly IProfileClient _profileClient;
         private readonly IRegisterClient _registerClient;
+        private readonly IAuthorizationService _authorizationService;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ContactPointService"/> class.
         /// </summary>
-        public ContactPointService(IProfileClient profile, IRegisterClient register)
+        public ContactPointService(IProfileClient profile, IRegisterClient register, IAuthorizationService authorizationService)
         {
             _profileClient = profile;
             _registerClient = register;
+            _authorizationService = authorizationService;
         }
 
         /// <inheritdoc/>
-        public async Task AddEmailContactPoints(List<Recipient> recipients)
+        public async Task AddEmailContactPoints(List<Recipient> recipients, string? resourceId)
         {
             await AugmentRecipients(
                 recipients,
+                resourceId,
                 (recipient, userContactPoints) =>
                 {
                     if (!string.IsNullOrEmpty(userContactPoints.Email))
@@ -40,16 +43,24 @@ await AugmentRecipients(
                 },
                 (recipient, orgContactPoints) =>
                 {
-                    recipient.AddressInfo.AddRange(orgContactPoints.EmailList.Select(e => new EmailAddressPoint(e)).ToList());
+                    recipient.AddressInfo.AddRange(orgContactPoints.EmailList
+                        .Select(e => new EmailAddressPoint(e))
+                        .ToList());
+
+                    recipient.AddressInfo.AddRange(orgContactPoints.UserContactPoints
+                        .Where(u => !string.IsNullOrEmpty(u.Email))
+                        .Select(u => new EmailAddressPoint(u.Email))
+                        .ToList());
                     return recipient;
                 });
         }
 
         /// <inheritdoc/>
-        public async Task AddSmsContactPoints(List<Recipient> recipients)
+        public async Task AddSmsContactPoints(List<Recipient> recipients, string? resourceId)
         {
             await AugmentRecipients(
                 recipients,
+                resourceId,
                 (recipient, userContactPoints) =>
                 {
                     if (!string.IsNullOrEmpty(userContactPoints.MobileNumber))
@@ -61,20 +72,28 @@ await AugmentRecipients(
                 },
                 (recipient, orgContactPoints) =>
                 {
-                    recipient.AddressInfo.AddRange(orgContactPoints.MobileNumberList.Select(m => new SmsAddressPoint(m)).ToList());
+                    recipient.AddressInfo.AddRange(orgContactPoints.MobileNumberList
+                        .Select(m => new SmsAddressPoint(m))
+                        .ToList());
+
+                    recipient.AddressInfo.AddRange(orgContactPoints.UserContactPoints
+                      .Where(u => !string.IsNullOrEmpty(u.MobileNumber))
+                      .Select(u => new SmsAddressPoint(u.MobileNumber))
+                      .ToList());
                     return recipient;
                 });
         }
 
         private async Task<List<Recipient>> AugmentRecipients(
             List<Recipient> recipients,
+            string? resourceId,
             Func<Recipient, UserContactPoints, Recipient> createUserContactPoint,
             Func<Recipient, OrganizationContactPoints, Recipient> createOrgContactPoint)
         {
             List<Recipient> augmentedRecipients = [];
 
             var userLookupTask = LookupPersonContactPoints(recipients);
-            var orgLookupTask = LookupOrganizationContactPoints(recipients);
+            var orgLookupTask = LookupOrganizationContactPoints(recipients, resourceId);
             await Task.WhenAll(userLookupTask, orgLookupTask);
 
             List<UserContactPoints> userContactPointsList = userLookupTask.Result;
@@ -130,10 +149,8 @@ private async Task<List<UserContactPoints>> LookupPersonContactPoints(List<Recip
             return contactPoints;
         }
 
-        private async Task<List<OrganizationContactPoints>> LookupOrganizationContactPoints(List<Recipient> recipients)
+        private async Task<List<OrganizationContactPoints>> LookupOrganizationContactPoints(List<Recipient> recipients, string? resourceId)
         {
-            /* the output from this function should include an AUHTORIZED list of user registered contact points if notification has a service affiliation 
-                will require the extension of the OrganizationContactPoints class */
             List<string> orgNos = recipients
              .Where(r => !string.IsNullOrEmpty(r.OrganizationNumber))
              .Select(r => r.OrganizationNumber!)
@@ -144,7 +161,38 @@ will require the extension of the OrganizationContactPoints class */
                 return [];
             }
 
-            List<OrganizationContactPoints> contactPoints = await _registerClient.GetOrganizationContactPoints(orgNos);
+            Task<List<OrganizationContactPoints>> registerTask = _registerClient.GetOrganizationContactPoints(orgNos);
+            List<OrganizationContactPoints> authorizedUserContactPoints = new();
+
+            if (!string.IsNullOrEmpty(resourceId))
+            {
+                var allUserContactPoints = await _profileClient.GetUserRegisteredContactPoints(orgNos, resourceId);
+                authorizedUserContactPoints = await _authorizationService.AuthorizeUserContactPointsForResource(allUserContactPoints, resourceId);
+            }
+
+            List<OrganizationContactPoints> contactPoints = await registerTask;
+
+            if (!string.IsNullOrEmpty(resourceId))
+            {
+                foreach (var userContactPoint in authorizedUserContactPoints)
+                {
+                    userContactPoint.UserContactPoints.ForEach(userContactPoint =>
+                    {
+                        userContactPoint.MobileNumber = MobileNumberHelper.EnsureCountryCodeIfValidNumber(userContactPoint.MobileNumber);
+                    });
+
+                    var existingContactPoint = contactPoints.Find(cp => cp.OrganizationNumber == userContactPoint.OrganizationNumber);
+
+                    if (existingContactPoint != null)
+                    {
+                        existingContactPoint.UserContactPoints.AddRange(userContactPoint.UserContactPoints);
+                    }
+                    else
+                    {
+                        contactPoints.Add(userContactPoint);
+                    }
+                }
+            }
 
             contactPoints.ForEach(contactPoint =>
             {

src/Altinn.Notifications.Core/Services/EmailOrderProcessingService.cs

@@ -36,7 +36,7 @@ public async Task ProcessOrder(NotificationOrder order)
         var recipients = order.Recipients;
         var recipientsWithoutEmail = recipients.Where(r => !r.AddressInfo.Exists(ap => ap.AddressType == AddressType.Email)).ToList();
 
-        await _contactPointService.AddEmailContactPoints(recipientsWithoutEmail);
+        await _contactPointService.AddEmailContactPoints(recipientsWithoutEmail, order.ResourceId);
 
         foreach (Recipient recipient in recipients)
         {
@@ -50,7 +50,7 @@ public async Task ProcessOrderRetry(NotificationOrder order)
         var recipients = order.Recipients;
         var recipientsWithoutEmail = recipients.Where(r => !r.AddressInfo.Exists(ap => ap.AddressType == AddressType.Email)).ToList();
 
-        await _contactPointService.AddEmailContactPoints(recipientsWithoutEmail);
+        await _contactPointService.AddEmailContactPoints(recipientsWithoutEmail, order.ResourceId);
 
         List<EmailRecipient> emailRecipients = await _emailNotificationRepository.GetRecipients(order.Id);
 

src/Altinn.Notifications.Core/Services/Interfaces/IContactPointService.cs

@@ -11,16 +11,18 @@ public interface IContactPointService
         /// Looks up and adds the email contact points for recipients based on their national identity number or organization number
         /// </summary>
         /// <param name="recipients">List of recipients to retrieve contact points for</param>
+        /// <param name="resourceId">The resource to find contact points in relation to</param>
         /// <returns>The list of recipients augumented with email address points where available</returns>
         /// <remarks>Implementation alters the recipient reference object directly</remarks>
-        public Task AddEmailContactPoints(List<Recipient> recipients);
+        public Task AddEmailContactPoints(List<Recipient> recipients, string? resourceId);
 
         /// <summary>
         /// Looks up and adds the SMS contact points for recipients based on their national identity number or organization number
         /// </summary>
         /// <param name="recipients">List of recipients to retrieve contact points for</param>
+        /// <param name="resourceId">The resource to find contact points in relation to</param>
         /// <returns>The list of recipients augumented with SMS address points where available</returns>
         /// <remarks>Implementation alters the recipient reference object directly</remarks>
-        public Task AddSmsContactPoints(List<Recipient> recipients);
+        public Task AddSmsContactPoints(List<Recipient> recipients, string? resourceId);
     }
 }

src/Altinn.Notifications.Core/Services/OrderRequestService.cs

@@ -49,7 +49,7 @@ public async Task<NotificationOrderRequestResponse> RegisterNotificationOrder(No
 
         // copying recipients by value to not alter the orderRequest that will be persisted
         var copiedRecipents = orderRequest.Recipients.Select(r => r.DeepCopy()).ToList();
-        var lookupResult = await GetRecipientLookupResult(copiedRecipents, orderRequest.NotificationChannel);
+        var lookupResult = await GetRecipientLookupResult(copiedRecipents, orderRequest.NotificationChannel, orderRequest.ResourceId);
 
         var templates = SetSenderIfNotDefined(orderRequest.Templates);
 
@@ -62,7 +62,8 @@ public async Task<NotificationOrderRequestResponse> RegisterNotificationOrder(No
             orderRequest.Creator,
             created,
             orderRequest.Recipients, 
-            orderRequest.IgnoreReservation);
+            orderRequest.IgnoreReservation,
+            orderRequest.ResourceId);
 
         NotificationOrder savedOrder = await _repository.Create(order);
 
@@ -73,7 +74,7 @@ public async Task<NotificationOrderRequestResponse> RegisterNotificationOrder(No
         };
     }
 
-    private async Task<RecipientLookupResult?> GetRecipientLookupResult(List<Recipient> recipients, NotificationChannel channel)
+    private async Task<RecipientLookupResult?> GetRecipientLookupResult(List<Recipient> recipients, NotificationChannel channel, string? resourceId)
     {
         List<Recipient> recipientsWithoutContactPoint = [];
 
@@ -96,11 +97,11 @@ public async Task<NotificationOrderRequestResponse> RegisterNotificationOrder(No
 
         if (channel == NotificationChannel.Email)
         {
-            await _contactPointService.AddEmailContactPoints(recipientsWithoutContactPoint);
+            await _contactPointService.AddEmailContactPoints(recipientsWithoutContactPoint, resourceId);
         }
         else if (channel == NotificationChannel.Sms)
         {
-            await _contactPointService.AddSmsContactPoints(recipientsWithoutContactPoint);
+            await _contactPointService.AddSmsContactPoints(recipientsWithoutContactPoint, resourceId);
         }
 
         var isReserved = recipients.Where(r => r.IsReserved.HasValue && r.IsReserved.Value).Select(r => r.NationalIdentityNumber!).ToList();

src/Altinn.Notifications.Core/Services/SmsOrderProcessingService.cs

@@ -36,7 +36,7 @@ public async Task ProcessOrder(NotificationOrder order)
     {
         var recipients = order.Recipients;
         var recipientsWithoutMobileNumber = recipients.Where(r => !r.AddressInfo.Exists(ap => ap.AddressType == AddressType.Sms)).ToList();
-        await _contactPointService.AddSmsContactPoints(recipientsWithoutMobileNumber);
+        await _contactPointService.AddSmsContactPoints(recipientsWithoutMobileNumber, order.ResourceId);
 
         int smsCount = GetSmsCountForOrder(order);
 
@@ -52,7 +52,7 @@ public async Task ProcessOrderRetry(NotificationOrder order)
         var recipients = order.Recipients;
         var recipientsWithoutMobileNumber = recipients.Where(r => !r.AddressInfo.Exists(ap => ap.AddressType == AddressType.Sms)).ToList();
 
-        await _contactPointService.AddSmsContactPoints(recipientsWithoutMobileNumber);
+        await _contactPointService.AddSmsContactPoints(recipientsWithoutMobileNumber, order.ResourceId);
 
         int smsCount = GetSmsCountForOrder(order);
         List<SmsRecipient> smsRecipients = await _smsNotificationRepository.GetRecipients(order.Id);

src/Altinn.Notifications.Integrations/Profile/ProfileClient.cs

@@ -7,6 +7,7 @@
 using Altinn.Notifications.Core.Shared;
 using Altinn.Notifications.Integrations.Configuration;
 using Altinn.Notifications.Integrations.Profile;
+using Altinn.Notifications.Integrations.Register;
 
 using Microsoft.Extensions.Options;
 
@@ -49,4 +50,28 @@ public async Task<List<UserContactPoints>> GetUserContactPoints(List<string> nat
         List<UserContactPoints>? contactPoints = JsonSerializer.Deserialize<UserContactPointsList>(responseContent, JsonSerializerOptionsProvider.Options)!.ContactPointsList;
         return contactPoints!;
     }
+
+    /// <inheritdoc/>
+    public async Task<List<OrganizationContactPoints>> GetUserRegisteredContactPoints(List<string> organizationNumbers, string resourceId)
+    {
+        var lookupObject = new UnitContactPointLookup()
+        {
+            ResourceId = resourceId,
+            OrganizationNumbers = organizationNumbers
+        };
+
+        HttpContent content = new StringContent(JsonSerializer.Serialize(lookupObject, JsonSerializerOptionsProvider.Options), Encoding.UTF8, "application/json");
+
+        var response = await _client.PostAsync("units/contactpoint/lookup", content);
+
+        if (!response.IsSuccessStatusCode)
+        {
+            throw new PlatformHttpException(response, $"ProfileClient.GetUserRegisteredContactPoints failed with status code {response.StatusCode}");
+        }
+
+        string responseContent = await response.Content.ReadAsStringAsync();
+        OrgContactPointsList? contactPoints = JsonSerializer.Deserialize<OrgContactPointsList>(responseContent, JsonSerializerOptionsProvider.Options)!;
+
+        return contactPoints.ContactPointsList!;
+    }
 }

src/Altinn.Notifications.Integrations/Profile/UnitContactPointLookup.cs

@@ -0,0 +1,18 @@
+namespace Altinn.Notifications.Integrations.Profile
+{
+    /// <summary>
+    /// A class describing the query model for contact points for units
+    /// </summary>
+    public class UnitContactPointLookup
+    {
+        /// <summary>
+        /// Gets or sets the list of organisation numbers to lookup contact points for
+        /// </summary>
+        public List<string> OrganizationNumbers { get; set; } = [];
+
+        /// <summary>
+        /// Gets or sets the resource id to filter the contact points by
+        /// </summary>
+        public string ResourceId { get; set; } = string.Empty;
+    }
+}

src/Altinn.Notifications/Controllers/EmailNotificationOrdersController.cs

@@ -1,7 +1,5 @@
 using Altinn.Notifications.Configuration;
-using Altinn.Notifications.Core.Models.Orders;
 using Altinn.Notifications.Core.Services.Interfaces;
-using Altinn.Notifications.Core.Shared;
 using Altinn.Notifications.Extensions;
 using Altinn.Notifications.Mappers;
 using Altinn.Notifications.Models;