Merge branch 'master' into chore/update-functions-to-net8

equinor · Aug 29, 2024 · 70c8b01 · 70c8b01
2 parents 7967842 + 07dfef0
commit 70c8b01
Show file tree

Hide file tree

Showing 18 changed files with 161 additions and 108 deletions.
diff --git a/src/Fusion.Resources.Functions.Common/ApiClients/ISummaryApiClient.cs b/src/Fusion.Resources.Functions.Common/ApiClients/ISummaryApiClient.cs
@@ -26,23 +26,17 @@ public Task PutWeeklySummaryReportAsync(string departmentSapId, ApiWeeklySummary
 
 public class ApiResourceOwnerDepartment
 {
-    public ApiResourceOwnerDepartment(string departmentSapId, string fullDepartmentName,
-        Guid resourceOwnerAzureUniqueId)
-    {
-        DepartmentSapId = departmentSapId;
-        FullDepartmentName = fullDepartmentName;
-        ResourceOwnerAzureUniqueId = resourceOwnerAzureUniqueId;
-    }
-
     public ApiResourceOwnerDepartment()
     {
     }
 
-    public string DepartmentSapId { get; init; } = string.Empty;
+    public string DepartmentSapId { get; init; } = null!;
+    public string FullDepartmentName { get; init; } = null!;
+
+    public Guid[] ResourceOwnersAzureUniqueId { get; init; } = null!;
 
-    public string FullDepartmentName { get; init; } = string.Empty;
+    public Guid[] DelegateResourceOwnersAzureUniqueId { get; init; } = null!;
 
-    public Guid ResourceOwnerAzureUniqueId { get; init; }
 }
 
 public record ApiCollection<T>(ICollection<T> Items);

diff --git a/src/Fusion.Summary.Api/BaseController.cs b/src/Fusion.Summary.Api/BaseController.cs
@@ -31,4 +31,10 @@ protected Task<TResult> DispatchAsync<TResult>(IRequest<TResult> command)
         var profileResolver = HttpContext.RequestServices.GetRequiredService<IFusionProfileResolver>();
         return await profileResolver.ResolvePersonBasicProfileAsync(personId);
     }
+
+    protected async Task<IEnumerable<ResolvedPersonProfile>> ResolvePersonsAsync(IEnumerable<PersonIdentifier> personIdentifiers)
+    {
+        var profileResolver = HttpContext.RequestServices.GetRequiredService<IFusionProfileResolver>();
+        return await profileResolver.ResolvePersonsAsync(personIdentifiers);
+    }
 }
diff --git a/src/Fusion.Summary.Api/Controllers/ApiModels/ApiDepartment.cs b/src/Fusion.Summary.Api/Controllers/ApiModels/ApiDepartment.cs
@@ -5,16 +5,20 @@ namespace Fusion.Summary.Api.Controllers.ApiModels;
 public class ApiDepartment
 {
     public string DepartmentSapId { get; set; } = string.Empty;
-    public Guid ResourceOwnerAzureUniqueId { get; set; }
     public string FullDepartmentName { get; set; } = string.Empty;
 
+    public Guid[] ResourceOwnersAzureUniqueId { get; init; } = null!;
+
+    public Guid[] DelegateResourceOwnersAzureUniqueId { get; init; } = null!;
+
     public static ApiDepartment FromQueryDepartment(QueryDepartment queryDepartment)
     {
         return new ApiDepartment
         {
             DepartmentSapId = queryDepartment.SapDepartmentId,
-            ResourceOwnerAzureUniqueId = queryDepartment.ResourceOwnerAzureUniqueId,
-            FullDepartmentName = queryDepartment.FullDepartmentName
+            FullDepartmentName = queryDepartment.FullDepartmentName,
+            ResourceOwnersAzureUniqueId = queryDepartment.ResourceOwnersAzureUniqueId.ToArray(),
+            DelegateResourceOwnersAzureUniqueId = queryDepartment.DelegateResourceOwnersAzureUniqueId.ToArray()
         };
     }
 }
diff --git a/src/Fusion.Summary.Api/Controllers/DepartmentsController.cs b/src/Fusion.Summary.Api/Controllers/DepartmentsController.cs
@@ -1,5 +1,6 @@
 using Fusion.AspNetCore.FluentAuthorization;
 using Fusion.Authorization;
+using Fusion.Integration.Profile;
 using Fusion.Summary.Api.Authorization.Extensions;
 using Fusion.Summary.Api.Controllers.ApiModels;
 using Fusion.Summary.Api.Controllers.Requests;
@@ -121,8 +122,17 @@ public async Task<IActionResult> PutV1(string sapDepartmentId, [FromBody] PutDep
         if (string.IsNullOrWhiteSpace(sapDepartmentId))
             return BadRequest("SapDepartmentId route parameter is required");
 
-        if (await ResolvePersonAsync(request.ResourceOwnerAzureUniqueId) is null)
-            return BadRequest("Resource owner not found in azure ad");
+        var personIdentifiers = request.ResourceOwnersAzureUniqueId
+            .Concat(request.DelegateResourceOwnersAzureUniqueId)
+            .Select(p => new PersonIdentifier(p));
+
+        var unresolvedProfiles = (await ResolvePersonsAsync(personIdentifiers))
+            .Where(r => !r.Success)
+            .ToList();
+
+        if (unresolvedProfiles.Count != 0)
+            return BadRequest($"Profiles: {string.Join(',', unresolvedProfiles)} could not be resolved");
+
 
         var department = await DispatchAsync(new GetDepartment(sapDepartmentId));
 
@@ -132,19 +142,23 @@ public async Task<IActionResult> PutV1(string sapDepartmentId, [FromBody] PutDep
             await DispatchAsync(
                 new CreateDepartment(
                     sapDepartmentId,
-                    request.ResourceOwnerAzureUniqueId,
-                    request.FullDepartmentName));
+                    request.FullDepartmentName,
+                    request.ResourceOwnersAzureUniqueId,
+                    request.DelegateResourceOwnersAzureUniqueId));
 
             return Created();
         }
-        // Check if department owner has changed
-        else if (department.ResourceOwnerAzureUniqueId != request.ResourceOwnerAzureUniqueId)
+
+        // Check if department owners has changed
+        if (!department.ResourceOwnersAzureUniqueId.SequenceEqual(request.ResourceOwnersAzureUniqueId) ||
+            !department.DelegateResourceOwnersAzureUniqueId.SequenceEqual(request.DelegateResourceOwnersAzureUniqueId))
         {
             await DispatchAsync(
                 new UpdateDepartment(
                     sapDepartmentId,
-                    request.ResourceOwnerAzureUniqueId,
-                    request.FullDepartmentName));
+                    request.FullDepartmentName,
+                    request.ResourceOwnersAzureUniqueId,
+                    request.DelegateResourceOwnersAzureUniqueId));
 
             return Ok();
         }

diff --git a/src/Fusion.Summary.Api/Controllers/Requests/PutDepartmentRequest.cs b/src/Fusion.Summary.Api/Controllers/Requests/PutDepartmentRequest.cs
@@ -2,14 +2,16 @@
 
 namespace Fusion.Summary.Api.Controllers.Requests;
 
-public record PutDepartmentRequest(string FullDepartmentName, Guid ResourceOwnerAzureUniqueId)
+public record PutDepartmentRequest(string FullDepartmentName, Guid[] ResourceOwnersAzureUniqueId, Guid[] DelegateResourceOwnersAzureUniqueId)
 {
     public class Validator : AbstractValidator<PutDepartmentRequest>
     {
         public Validator()
         {
             RuleFor(x => x.FullDepartmentName).NotEmpty();
-            RuleFor(x => x.ResourceOwnerAzureUniqueId).NotEmpty();
+            RuleFor(x => x.ResourceOwnersAzureUniqueId.Concat(x.DelegateResourceOwnersAzureUniqueId))
+                .NotEmpty()
+                .WithMessage($"Either {nameof(ResourceOwnersAzureUniqueId)} or {nameof(DelegateResourceOwnersAzureUniqueId)} must contain at least one element.");
         }
     }
 };

diff --git a/...ations/20240807132047_Initial.Designer.cs → ...ations/20240821133720_Initial.Designer.cs b/...ations/20240807132047_Initial.Designer.cs → ...ations/20240821133720_Initial.Designer.cs
diff --git a/...base/Migrations/20240807132047_Initial.cs → ...base/Migrations/20240821133720_Initial.cs b/...base/Migrations/20240807132047_Initial.cs → ...base/Migrations/20240821133720_Initial.cs
@@ -16,8 +16,9 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 columns: table => new
                 {
                     DepartmentSapId = table.Column<string>(type: "nvarchar(450)", nullable: false),
-                    ResourceOwnerAzureUniqueId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
-                    FullDepartmentName = table.Column<string>(type: "nvarchar(max)", nullable: false)
+                    FullDepartmentName = table.Column<string>(type: "nvarchar(max)", nullable: false),
+                    ResourceOwnersAzureUniqueId = table.Column<string>(type: "nvarchar(max)", nullable: false),
+                    DelegateResourceOwnersAzureUniqueId = table.Column<string>(type: "nvarchar(max)", nullable: false)
                 },
                 constraints: table =>
                 {

diff --git a/src/Fusion.Summary.Api/Database/Migrations/SummaryDbContextModelSnapshot.cs b/src/Fusion.Summary.Api/Database/Migrations/SummaryDbContextModelSnapshot.cs
@@ -27,12 +27,17 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<string>("DepartmentSapId")
                         .HasColumnType("nvarchar(450)");
 
+                    b.Property<string>("DelegateResourceOwnersAzureUniqueId")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
                     b.Property<string>("FullDepartmentName")
                         .IsRequired()
                         .HasColumnType("nvarchar(max)");
 
-                    b.Property<Guid>("ResourceOwnerAzureUniqueId")
-                        .HasColumnType("uniqueidentifier");
+                    b.Property<string>("ResourceOwnersAzureUniqueId")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
 
                     b.HasKey("DepartmentSapId");
 

diff --git a/src/Fusion.Summary.Api/Database/Models/DbDepartment.cs b/src/Fusion.Summary.Api/Database/Models/DbDepartment.cs
@@ -6,16 +6,20 @@ namespace Fusion.Summary.Api.Database.Models;
 public class DbDepartment
 {
     public string DepartmentSapId { get; set; } = string.Empty;
-    public Guid ResourceOwnerAzureUniqueId { get; set; }
     public string FullDepartmentName { get; set; } = string.Empty;
 
+    public List<Guid> ResourceOwnersAzureUniqueId { get; set; } = [];
+
+    public List<Guid> DelegateResourceOwnersAzureUniqueId { get; set; } = [];
+
     public static DbDepartment FromQueryDepartment(QueryDepartment queryDepartment)
     {
         return new DbDepartment
         {
             DepartmentSapId = queryDepartment.SapDepartmentId,
-            ResourceOwnerAzureUniqueId = queryDepartment.ResourceOwnerAzureUniqueId,
-            FullDepartmentName = queryDepartment.FullDepartmentName
+            FullDepartmentName = queryDepartment.FullDepartmentName,
+            ResourceOwnersAzureUniqueId = queryDepartment.ResourceOwnersAzureUniqueId.ToList(),
+            DelegateResourceOwnersAzureUniqueId = queryDepartment.DelegateResourceOwnersAzureUniqueId.ToList()
         };
     }
 

diff --git a/src/Fusion.Summary.Api/Domain/Commands/CreateDepartment.cs b/src/Fusion.Summary.Api/Domain/Commands/CreateDepartment.cs
@@ -9,13 +9,15 @@ public class CreateDepartment : IRequest
 {
     private QueryDepartment _queryDepartment;
 
-    public CreateDepartment(string SapDepartmentId, Guid ResourceOwnerAzureUniqueId, string FullDepartmentName)
+    public CreateDepartment(string sapDepartmentId, string fullDepartmentName,
+        IEnumerable<Guid> resourceOwnersAzureUniqueId, IEnumerable<Guid> delegateResourceOwnersAzureUniqueId)
     {
         _queryDepartment = new QueryDepartment
         {
-            SapDepartmentId = SapDepartmentId,
-            ResourceOwnerAzureUniqueId = ResourceOwnerAzureUniqueId,
-            FullDepartmentName = FullDepartmentName
+            SapDepartmentId = sapDepartmentId,
+            FullDepartmentName = fullDepartmentName,
+            ResourceOwnersAzureUniqueId = resourceOwnersAzureUniqueId.ToList(),
+            DelegateResourceOwnersAzureUniqueId = delegateResourceOwnersAzureUniqueId.ToList()
         };
     }
 

diff --git a/src/Fusion.Summary.Api/Domain/Commands/UpdateDepartment.cs b/src/Fusion.Summary.Api/Domain/Commands/UpdateDepartment.cs
@@ -10,13 +10,15 @@ public class UpdateDepartment : IRequest
 {
     private QueryDepartment _queryDepartment;
 
-    public UpdateDepartment(string SapDepartmentId, Guid ResourceOwnerAzureUniqueId, string FullDepartmentName)
+    public UpdateDepartment(string sapDepartmentId, string fullDepartmentName,
+        IEnumerable<Guid> resourceOwnersAzureUniqueId, IEnumerable<Guid> delegateResourceOwnersAzureUniqueId)
     {
         _queryDepartment = new QueryDepartment
         {
-            SapDepartmentId = SapDepartmentId,
-            ResourceOwnerAzureUniqueId = ResourceOwnerAzureUniqueId,
-            FullDepartmentName = FullDepartmentName
+            SapDepartmentId = sapDepartmentId,
+            FullDepartmentName = fullDepartmentName,
+            ResourceOwnersAzureUniqueId = resourceOwnersAzureUniqueId.ToList(),
+            DelegateResourceOwnersAzureUniqueId = delegateResourceOwnersAzureUniqueId.ToList()
         };
     }
 
@@ -35,12 +37,10 @@ public async Task Handle(UpdateDepartment request, CancellationToken cancellatio
 
             if (existingDepartment != null)
             {
-                if (existingDepartment.ResourceOwnerAzureUniqueId != request._queryDepartment.ResourceOwnerAzureUniqueId)
-                {
-                    existingDepartment.ResourceOwnerAzureUniqueId = request._queryDepartment.ResourceOwnerAzureUniqueId;
+                existingDepartment.ResourceOwnersAzureUniqueId = request._queryDepartment.ResourceOwnersAzureUniqueId.ToList();
+                existingDepartment.DelegateResourceOwnersAzureUniqueId = request._queryDepartment.DelegateResourceOwnersAzureUniqueId.ToList();
 
-                    await _context.SaveChangesAsync();
-                }
+                await _context.SaveChangesAsync();
             }
         }
     }

diff --git a/src/Fusion.Summary.Api/Domain/Models/QueryDepartment.cs b/src/Fusion.Summary.Api/Domain/Models/QueryDepartment.cs
@@ -6,16 +6,19 @@ namespace Fusion.Summary.Api.Domain.Models;
 public class QueryDepartment
 {
     public string SapDepartmentId { get; set; } = string.Empty;
-    public Guid ResourceOwnerAzureUniqueId { get; set; }
     public string FullDepartmentName { get; set; } = string.Empty;
+    public List<Guid> ResourceOwnersAzureUniqueId { get; set; } = null!;
+
+    public List<Guid> DelegateResourceOwnersAzureUniqueId { get; set; } = null!;
 
     public static QueryDepartment FromDbDepartment(DbDepartment dbDepartment)
     {
         return new QueryDepartment
         {
             SapDepartmentId = dbDepartment.DepartmentSapId,
-            ResourceOwnerAzureUniqueId = dbDepartment.ResourceOwnerAzureUniqueId,
-            FullDepartmentName = dbDepartment.FullDepartmentName
+            FullDepartmentName = dbDepartment.FullDepartmentName,
+            ResourceOwnersAzureUniqueId = dbDepartment.ResourceOwnersAzureUniqueId.ToList(),
+            DelegateResourceOwnersAzureUniqueId = dbDepartment.DelegateResourceOwnersAzureUniqueId.ToList()
         };
     }
 
@@ -24,7 +27,9 @@ public static QueryDepartment FromApiDepartment(ApiDepartment apiDepartment)
         return new QueryDepartment
         {
             SapDepartmentId = apiDepartment.DepartmentSapId,
-            FullDepartmentName = apiDepartment.FullDepartmentName
+            FullDepartmentName = apiDepartment.FullDepartmentName,
+            ResourceOwnersAzureUniqueId = apiDepartment.ResourceOwnersAzureUniqueId.ToList(),
+            DelegateResourceOwnersAzureUniqueId = apiDepartment.DelegateResourceOwnersAzureUniqueId.ToList()
         };
     }
 }
diff --git a/src/Fusion.Summary.Functions/Deployment/disabled-functions.json b/src/Fusion.Summary.Functions/Deployment/disabled-functions.json
@@ -2,8 +2,8 @@
   {
     "environment": "pr",
     "disabledFunctions": [
-      "department-resource-owner-sync",
-      "weekly-report-sender",
+      "weekly-department-recipients-sync",
+      "weekly-department-summary-sender",
       "weekly-department-summary-worker"
     ]
   }