Merge remote-tracking branch 'origin/master' into feat/workday-manage…

…r-structure-support
equinor · Nov 18, 2024 · e099980 · e099980
2 parents 001c014 + 32fba0c
commit e099980
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 6 deletions.
diff --git a/pipelines/templates/deploy-summary-function-pr-template.yml b/pipelines/templates/deploy-summary-function-pr-template.yml
@@ -49,7 +49,7 @@ steps:
 
       $settings = @{
           clientId = "${{ parameters.clientId }}"
-          departmentFilter = "PRD"
+          departmentFilter = ""
           projectTypeFilter = "PRD"
           secretIds = @{
               clientSecret = "https://$envVaultName.vault.azure.net:443/secrets/AzureAd--ClientSecret"

diff --git a/pipelines/templates/deploy-summary-function-template.yml b/pipelines/templates/deploy-summary-function-template.yml
@@ -47,7 +47,7 @@ steps:
 
       $settings = @{
           clientId = "${{ parameters.clientId }}"
-          departmentFilter = "PRD"
+          departmentFilter = ""
           projectTypeFilter = "PRD"
           secretIds = @{
               clientSecret = Get-SecretsId -secret AzureAd--ClientSecret

diff --git a/src/Fusion.Resources.Functions.Common/ApiClients/LineOrgApiClient.cs b/src/Fusion.Resources.Functions.Common/ApiClients/LineOrgApiClient.cs
@@ -45,6 +45,7 @@ public class OrgUnits
         public string? FullDepartment { get; set; }
         public string? SapId { get; set; }
         public Management Management { get; set; }
+        public int Level { get; set; }
     }
 
     public class Management

diff --git a/src/Fusion.Summary.Functions/Functions/DepartmentResourceOwnerSync.cs b/src/Fusion.Summary.Functions/Functions/DepartmentResourceOwnerSync.cs
@@ -78,7 +78,8 @@ public async Task RunAsync(
         // Fetch all departments
         var departments = (await lineOrgApiClient.GetOrgUnitDepartmentsAsync())
             .DistinctBy(d => d.SapId)
-            .Where(d => d.FullDepartment != null && d.SapId != null);
+            .Where(d => d.FullDepartment != null && d.SapId != null)
+            .Where(d => d.Level >= 4);
 
         if (_departmentFilter.Length != 0)
             departments = departments.Where(d => _departmentFilter.Any(df => d.FullDepartment!.Contains(df)));

diff --git a/...Functions/Notifications/ResourceOwner/WeeklyReport/ScheduledReportTimerTriggerFunction.cs b/...Functions/Notifications/ResourceOwner/WeeklyReport/ScheduledReportTimerTriggerFunction.cs
@@ -88,7 +88,7 @@ private async Task SendResourceOwnersToQueue(ServiceBusSender sender, int totalB
             // Query departments from LineOrg
             var departments = (await _lineOrgClient.GetOrgUnitDepartmentsAsync())
                 .Where(d => d.FullDepartment != null)                     // Exclude departments with blank department name
-                .Where(d => d.FullDepartment.Contains("PRD"))
+                .Where(d => d.Level >= 4)                                 // Only include departments of level 4 and up
                 .Where(x => x.Management?.Persons.Length > 0)             // Exclude departments with no receivers
                 .ToList();
 

diff --git a/src/backend/function/Fusion.Resources.Functions/Fusion.Resources.Functions.csproj b/src/backend/function/Fusion.Resources.Functions/Fusion.Resources.Functions.csproj
@@ -7,8 +7,8 @@
 	<ItemGroup>
         <PackageReference Include="Microsoft.NET.Sdk.Functions" Version="4.5.0"/>
 		<PackageReference Include="Microsoft.Azure.Functions.Extensions" Version="1.1.0" />
-		<PackageReference Include="Microsoft.Azure.WebJobs.Extensions.ServiceBus" Version="5.16.4"/>
-		<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0"/>
+		<PackageReference Include="Microsoft.Azure.WebJobs.Extensions.ServiceBus" Version="5.16.4" />
+		<PackageReference Include="System.Text.Json" Version="8.0.5" />
 	</ItemGroup>
 	<ItemGroup>
 		<ProjectReference Include="..\..\..\Fusion.Resources.Functions.Common\Fusion.Resources.Functions.Common.csproj" />