PostFundManagement.Api/PostFundManagement.Api.csproj

@@ -90,7 +90,7 @@
   <!-- Shared Static Usings -->
   <ItemGroup>    
     <Using Static="true" Include="PostFundManagement.Application.Extensions.General" />
-    <Using Static="true" Alias="Problems" Include="Microsoft.AspNetCore.Mvc.ProblemDetails" />
+    <Using Alias="Problems" Include="Microsoft.AspNetCore.Mvc.ProblemDetails" />
   </ItemGroup>
 
   <!-- Shared Global Usings -->

PostFundManagement.Application/Abstractions/Services/IToolService.cs

@@ -1,6 +0,0 @@
-namespace PostFundManagement.Application.Abstractions.Services;
-
-public interface IToolService
-{
-    Task<Result<string>> EncodeLong(long id, CancellationToken cancellationToken);
-}

PostFundManagement.Application/Extensions/Postgres.cs

@@ -1,5 +1,4 @@
 using PostFundManagement.Infrastructure.Database;
-using static PostFundManagement.Domain.Extensions.Constants;
 
 namespace PostFundManagement.Application.Extensions;
 

PostFundManagement.Application/Extensions/Quartz.cs

@@ -1,6 +1,5 @@
 using PostFundManagement.Domain.Abstractions;
 using PostFundManagement.Domain.Quartz;
-using static PostFundManagement.Domain.Extensions.Constants;
 
 namespace PostFundManagement.Application.Extensions;
 

PostFundManagement.Application/Extensions/S3.cs

@@ -1,6 +1,5 @@
 using PostFundManagement.Application.Services.Shared;
 using PostFundManagement.Domain.Abstractions;
-using static PostFundManagement.Domain.Extensions.Constants;
 
 namespace PostFundManagement.Application.Extensions;
 

PostFundManagement.Application/Extensions/Security.cs

@@ -5,7 +5,6 @@ using PostFundManagement.Domain.Configuration.Security;
 using PostFundManagement.Domain.Extensions;
 using PostFundManagement.Infrastructure.Database;
 using PostFundManagement.Infrastructure.Security;
-using static PostFundManagement.Domain.Extensions.Constants;
 
 namespace PostFundManagement.Application.Extensions;
 

PostFundManagement.Application/Filters/ActiveUserFilter.cs

@@ -1,6 +1,4 @@
 using PostFundManagement.Application.Abstractions.Services;
-using static PostFundManagement.Application.Extensions.General;
-using static PostFundManagement.Domain.Extensions.Constants;
 
 namespace PostFundManagement.Application.Filters;
 

PostFundManagement.Application/Filters/UserRoleFilter.cs

@@ -1,6 +1,5 @@
 using PostFundManagement.Application.Extensions;
 using PostFundManagement.Domain.Abstractions;
-using static PostFundManagement.Domain.Extensions.Constants;
 
 namespace PostFundManagement.Application.Filters;
 

PostFundManagement.Application/PostFundManagement.Application.csproj

@@ -36,6 +36,12 @@
     <Using Include="Microsoft.AspNetCore.OpenApi" />
   </ItemGroup>
 
+  <!-- Shared Static Usings -->
+  <ItemGroup>
+    <Using Static="true" Include="PostFundManagement.Application.Extensions.General" />
+    <Using Static="true" Include="PostFundManagement.Domain.Extensions.Constants" />
+  </ItemGroup>
+
   <!-- Shared Usings -->
   <ItemGroup>
     <Using Include="Humanizer" />

PostFundManagement.Application/Services/Communications/CommunicationsCacheService.cs

@@ -3,7 +3,6 @@ using PostFundManagement.Application.Extensions;
 using PostFundManagement.Application.Services.Shared;
 using PostFundManagement.Domain;
 using PostFundManagement.Domain.Models;
-using static PostFundManagement.Domain.Extensions.Constants;
 
 namespace PostFundManagement.Application.Services.Communications;
 

PostFundManagement.Application/Services/Communications/Records.cs

@@ -1,5 +1,4 @@
 using PostFundManagement.Domain;
-using static PostFundManagement.Domain.Extensions.Constants;
 
 namespace PostFundManagement.Application.Services.Communications;
 

PostFundManagement.Application/Services/Evidence/EvidenceCacheService.cs

@@ -3,7 +3,6 @@ using PostFundManagement.Application.Extensions;
 using PostFundManagement.Application.Services.Shared;
 using PostFundManagement.Domain;
 using PostFundManagement.Domain.Models;
-using static PostFundManagement.Domain.Extensions.Constants;
 
 namespace PostFundManagement.Application.Services.Evidence;
 

PostFundManagement.Application/Services/Evidence/Records.cs

@@ -1,5 +1,4 @@
 using PostFundManagement.Domain;
-using static PostFundManagement.Domain.Extensions.Constants;
 
 namespace PostFundManagement.Application.Services.Evidence;
 

PostFundManagement.Application/Services/Execution/ExecutionCacheService.cs

@@ -3,7 +3,6 @@ using PostFundManagement.Application.Extensions;
 using PostFundManagement.Application.Services.Shared;
 using PostFundManagement.Domain;
 using PostFundManagement.Domain.Models;
-using static PostFundManagement.Domain.Extensions.Constants;
 
 namespace PostFundManagement.Application.Services.Execution;
 

PostFundManagement.Application/Services/Execution/Records.cs

@@ -1,5 +1,4 @@
 using PostFundManagement.Domain;
-using static PostFundManagement.Domain.Extensions.Constants;
 
 namespace PostFundManagement.Application.Services.Execution;
 

PostFundManagement.Application/Services/Governance/GovernanceCacheService.cs

@@ -3,7 +3,6 @@ using PostFundManagement.Application.Extensions;
 using PostFundManagement.Application.Services.Shared;
 using PostFundManagement.Domain;
 using PostFundManagement.Domain.Models;
-using static PostFundManagement.Domain.Extensions.Constants;
 
 namespace PostFundManagement.Application.Services.Governance;
 

PostFundManagement.Application/Services/Governance/Records.cs

@@ -1,5 +1,4 @@
 using PostFundManagement.Domain;
-using static PostFundManagement.Domain.Extensions.Constants;
 
 namespace PostFundManagement.Application.Services.Governance;
 

PostFundManagement.Application/Services/Grants/GrantsCacheService.cs

@@ -3,7 +3,6 @@ using PostFundManagement.Application.Extensions;
 using PostFundManagement.Application.Services.Shared;
 using PostFundManagement.Domain;
 using PostFundManagement.Domain.Models;
-using static PostFundManagement.Domain.Extensions.Constants;
 
 namespace PostFundManagement.Application.Services.Grants;
 

PostFundManagement.Application/Services/Grants/Records.cs

@@ -1,5 +1,4 @@
 using PostFundManagement.Domain;
-using static PostFundManagement.Domain.Extensions.Constants;
 
 namespace PostFundManagement.Application.Services.Grants;
 

PostFundManagement.Application/Services/Projects/ProjectCacheService.cs

@@ -3,7 +3,6 @@ using PostFundManagement.Application.Extensions;
 using PostFundManagement.Application.Services.Shared;
 using PostFundManagement.Domain;
 using PostFundManagement.Domain.Models;
-using static PostFundManagement.Domain.Extensions.Constants;
 
 namespace PostFundManagement.Application.Services.Projects;
 

PostFundManagement.Application/Services/Projects/Records.cs

@@ -1,5 +1,4 @@
 using PostFundManagement.Domain;
-using static PostFundManagement.Domain.Extensions.Constants;
 
 namespace PostFundManagement.Application.Services.Projects;
 

PostFundManagement.Application/Services/Shared/GeneralS3Service.cs

@@ -1,6 +1,5 @@
 using PostFundManagement.Application.Abstractions.Services;
 using PostFundManagement.Domain.Abstractions;
-using static PostFundManagement.Domain.Extensions.Constants;
 
 namespace PostFundManagement.Application.Services.Shared;
 

PostFundManagement.Application/Services/Users/UserCacheService.cs

@@ -3,7 +3,6 @@ using PostFundManagement.Application.Extensions;
 using PostFundManagement.Application.Services.Shared;
 using PostFundManagement.Domain;
 using PostFundManagement.Domain.Models;
-using static PostFundManagement.Domain.Extensions.Constants;
 
 namespace PostFundManagement.Application.Services.Users;
 

PostFundManagement.Domain/Entities/Activity.cs

@@ -1,5 +1,4 @@
 using PostFundManagement.Domain.Abstractions;
-using static PostFundManagement.Domain.Extensions.Constants;
 
 namespace PostFundManagement.Domain.Entities;
 

PostFundManagement.Domain/Entities/AuditLog.cs

@@ -1,5 +1,3 @@
-using static PostFundManagement.Domain.Extensions.Constants;
-
 namespace PostFundManagement.Domain.Entities;
 
 [EntityTypeConfiguration<AuditLogConfiguration, AuditLog>]

PostFundManagement.Domain/Entities/Beneficiary.cs

@@ -1,5 +1,4 @@
 using PostFundManagement.Domain.Abstractions;
-using static PostFundManagement.Domain.Extensions.Constants;
 
 namespace PostFundManagement.Domain.Entities;
 

PostFundManagement.Domain/Entities/Budget.cs

@@ -1,5 +1,4 @@
 using PostFundManagement.Domain.Abstractions;
-using static PostFundManagement.Domain.Extensions.Constants;
 
 namespace PostFundManagement.Domain.Entities;
 

PostFundManagement.Domain/Entities/ChangeRequest.cs

@@ -1,5 +1,4 @@
 using PostFundManagement.Domain.Abstractions;
-using static PostFundManagement.Domain.Extensions.Constants;
 
 namespace PostFundManagement.Domain.Entities;
 

PostFundManagement.Domain/Entities/ComplianceItem.cs

@@ -1,5 +1,4 @@
 using PostFundManagement.Domain.Abstractions;
-using static PostFundManagement.Domain.Extensions.Constants;
 
 namespace PostFundManagement.Domain.Entities;
 

PostFundManagement.Domain/Entities/Indicator.cs

@@ -1,5 +1,4 @@
 using PostFundManagement.Domain.Abstractions;
-using static PostFundManagement.Domain.Extensions.Constants;
 
 namespace PostFundManagement.Domain.Entities;
 

PostFundManagement.Domain/Entities/Instrument.cs

@@ -1,5 +1,4 @@
 using PostFundManagement.Domain.Abstractions;
-using static PostFundManagement.Domain.Extensions.Constants;
 
 namespace PostFundManagement.Domain.Entities;
 

PostFundManagement.Domain/Entities/Issue.cs

@@ -1,5 +1,4 @@
 using PostFundManagement.Domain.Abstractions;
-using static PostFundManagement.Domain.Extensions.Constants;
 
 namespace PostFundManagement.Domain.Entities;
 

PostFundManagement.Domain/Entities/Milestone.cs

@@ -1,5 +1,4 @@
 using PostFundManagement.Domain.Abstractions;
-using static PostFundManagement.Domain.Extensions.Constants;
 
 namespace PostFundManagement.Domain.Entities;
 

PostFundManagement.Domain/Entities/Notification.cs

@@ -1,5 +1,4 @@
 using PostFundManagement.Domain.Abstractions;
-using static PostFundManagement.Domain.Extensions.Constants;
 
 namespace PostFundManagement.Domain.Entities;
 

PostFundManagement.Domain/Entities/Organisation.cs

@@ -1,5 +1,3 @@
-using static PostFundManagement.Domain.Extensions.Constants;
-
 namespace PostFundManagement.Domain.Entities;
 
 [EntityTypeConfiguration<OrganisationConfiguration, Organisation>]

PostFundManagement.Domain/Entities/Outcome.cs

@@ -1,5 +1,4 @@
 using PostFundManagement.Domain.Abstractions;
-using static PostFundManagement.Domain.Extensions.Constants;
 
 namespace PostFundManagement.Domain.Entities;
 

PostFundManagement.Domain/Entities/Portfolio.cs

@@ -1,5 +1,4 @@
 using PostFundManagement.Domain.Abstractions;
-using static PostFundManagement.Domain.Extensions.Constants;
 
 namespace PostFundManagement.Domain.Entities;
 

PostFundManagement.Domain/Entities/Programme.cs

@@ -1,5 +1,4 @@
 using PostFundManagement.Domain.Abstractions;
-using static PostFundManagement.Domain.Extensions.Constants;
 
 namespace PostFundManagement.Domain.Entities;
 

PostFundManagement.Domain/Entities/Project.cs

@@ -1,5 +1,4 @@
 using PostFundManagement.Domain.Abstractions;
-using static PostFundManagement.Domain.Extensions.Constants;
 
 namespace PostFundManagement.Domain.Entities;
 

PostFundManagement.Domain/Entities/Risk.cs

@@ -1,5 +1,4 @@
 using PostFundManagement.Domain.Abstractions;
-using static PostFundManagement.Domain.Extensions.Constants;
 
 namespace PostFundManagement.Domain.Entities;
 

PostFundManagement.Domain/Entities/Rule.cs

@@ -1,5 +1,4 @@
 using PostFundManagement.Domain.Abstractions;
-using static PostFundManagement.Domain.Extensions.Constants;
 
 namespace PostFundManagement.Domain.Entities;
 

PostFundManagement.Domain/Entities/SiteVisit.cs

@@ -1,5 +1,4 @@
 using PostFundManagement.Domain.Abstractions;
-using static PostFundManagement.Domain.Extensions.Constants;
 
 namespace PostFundManagement.Domain.Entities;
 

PostFundManagement.Domain/Entities/Tenant.cs

@@ -1,6 +1,4 @@
-using static PostFundManagement.Domain.Extensions.Constants;
+namespace PostFundManagement.Domain.Entities;
-
-namespace PostFundManagement.Domain.Entities;
 
 [EntityTypeConfiguration<TenantConfiguration, Tenant>]
 public class Tenant : Models.Tenant

PostFundManagement.Domain/Entities/User.cs

@@ -1,5 +1,3 @@
-using static PostFundManagement.Domain.Extensions.Constants;
-
 namespace PostFundManagement.Domain.Entities;
 
 [EntityTypeConfiguration<UserConfiguration, User>]

PostFundManagement.Domain/Enums.cs

@@ -9,7 +9,7 @@ public enum EmailStatuses : int
     Disconnected = 4,
     TooManyConnections = 5,
     ConnectionAborted = 6,
-    Success = 7
+    Success = 7,
 }
 
 public enum NotificationStatus : int
@@ -22,7 +22,7 @@ public enum NotificationStatus : int
     Read = 6,
     Failed = 7,
     Cancelled = 8,
-    Bounced = 9
+    Bounced = 9,
 }
 
 public enum NotificationPlatform : int
@@ -35,7 +35,7 @@ public enum NotificationPlatform : int
     Teams = 6,
     Slack = 7,
     Webhook = 8,
-    Other = 99
+    Other = 99,
 }
 
 public enum EvidenceType : int
@@ -51,7 +51,7 @@ public enum EvidenceType : int
     ProcurementDocument = 9,
     TechnicalSpecificationOrDesign = 10,
     VideoRecording = 11,
-    Other = 99
+    Other = 99,
 }
 
 public enum ProjectType : int
@@ -66,7 +66,7 @@ public enum ProjectType : int
     SocialImpactAndCommunityDevelopment = 8,
     TechnologyTransferAndAdoption = 9,
     Innovation = 10,
-    Other = 99
+    Other = 99,
 }
 
 public enum IndustrySector : int
@@ -88,7 +88,7 @@ public enum IndustrySector : int
     RetailAndConsumerGoods = 15,
     TourismAndHospitality = 16,
     WaterAndSanitation = 17,
-    Other = 99
+    Other = 99,
 }
 
 public enum OrganisationType : int
@@ -132,7 +132,7 @@ public enum OrganisationType : int
 
     // Consortium & Special Vehicles
     Consortium = 26,                 // Unincorporated joint venture
-    SpecialPurposeVehicle = 27       // SPV / Joint Venture Entity
+    SpecialPurposeVehicle = 27,       // SPV / Joint Venture Entity
 }
 
 public enum Priority : int
@@ -140,7 +140,7 @@ public enum Priority : int
     Low = 1,
     Medium = 2,
     High = 3,
-    Critical = 4
+    Critical = 4,
 }
 
 public enum UnitOfMeasure : int
@@ -153,7 +153,7 @@ public enum UnitOfMeasure : int
     Volume = 6,
     DurationDays = 7,
     DurationMonths = 8,
-    Ratio = 9
+    Ratio = 9,
 }
 public enum ContractStatus : int
 {
@@ -162,7 +162,7 @@ public enum ContractStatus : int
     Active = 3,
     Expired = 4,
     Terminated = 5,
-    Amended = 6
+    Amended = 6,
 }
 
 public enum RiskLikelihood : int
@@ -171,7 +171,7 @@ public enum RiskLikelihood : int
     Unlikely = 2,
     Possible = 3,
     Likely = 4,
-    AlmostCertain = 5
+    AlmostCertain = 5,
 }
 
 public enum RiskImpact : int
@@ -180,7 +180,7 @@ public enum RiskImpact : int
     Minor = 2,
     Moderate = 3,
     Major = 4,
-    Critical = 5
+    Critical = 5,
 }
 
 public enum ApprovalStatus : int
@@ -189,12 +189,12 @@ public enum ApprovalStatus : int
     Review = 2,
     Approved = 3,
     Rejected = 4,
-    Removed = 5
+    Removed = 5,
 }
 
 public enum ActivityStatus : int
 {
     Active = 1,
     Inactive = 2,
-    Disabled = 3
+    Disabled = 3,
 }

PostFundManagement.Domain/Health/PostgresHealthCheck.cs

@@ -1,5 +1,3 @@
-using static PostFundManagement.Domain.Extensions.Constants;
-
 namespace PostFundManagement.Domain.Health;
 
 public sealed class PostgresHealthCheck(IConfiguration configuration) : IHealthCheck

PostFundManagement.Domain/Health/QuartzHealthCheck.cs

@@ -1,5 +1,3 @@
-using static PostFundManagement.Domain.Extensions.Constants;
-
 namespace PostFundManagement.Domain.Health;
 
 public sealed class QuartzHealthCheck(ISchedulerFactory schedulerFactory) : IHealthCheck

PostFundManagement.Domain/Models/Security/Contracts.cs

@@ -6,10 +6,10 @@ public sealed record UpdateUserRequest(string Id, string UserName, string Email,
 
 public sealed record Claim(string ClaimType, string ClaimValue, int? ClaimId = null);
 
-public record ClaimsResponse(int TotalCount, int PageSize, ICollection<Claim> Claims);
+public sealed record ClaimsResponse(int TotalCount, int PageSize, ICollection<Claim> Claims);
 
 public sealed record UserResponse(string Id, string UserName, string Email, bool IsLockedOut, bool LockoutEnabled);
 
-public record Role(string Id, string Name);
+public sealed record Role(string Id, string Name);
 
-public record RolesResponse(int TotalCount, int PageSize, ICollection<Role> Roles);
+public sealed record RolesResponse(int TotalCount, int PageSize, ICollection<Role> Roles);

PostFundManagement.Domain/PostFundManagement.Domain.csproj

@@ -30,7 +30,7 @@
   </ItemGroup>
 
   <!-- Security (IODC)-->
-<ItemGroup>
+  <ItemGroup>
     <PackageReference Include="IdentityModel.AspNetCore" Version="4.3.0" />
     <PackageReference Include="IdentityModel.AspNetCore.OAuth2introspection" Version="6.2.0" />
     <PackageReference Include="IdentityServer4.AccessTokenValidation" Version="3.0.1" />
@@ -50,37 +50,37 @@
     <Using Include="Microsoft.AspNetCore.Authentication.Cookies" />
     <Using Include="IdentityModel.AspNetCore.OAuth2Introspection" />
     <Using Include="Microsoft.AspNetCore.Authentication.JwtBearer" />
-</ItemGroup>
+  </ItemGroup>
 
-<!-- API SDK Composer-->
+  <!-- API SDK Composer-->
-<ItemGroup>
+  <ItemGroup>
     <PackageReference Include="Refit.HttpClientFactory" Version="15.2.0" />
 
     <Using Include="Refit" />
-</ItemGroup>
+  </ItemGroup>
 
-<!-- API Versioning -->
+  <!-- API Versioning -->
-<ItemGroup>
+  <ItemGroup>
     <PackageReference Include="AccessTokenClient.Extensions" Version="5.1.0" />
     <PackageReference Include="Asp.Versioning.Abstractions" Version="10.2.1" />
     <PackageReference Include="Asp.Versioning.Http" Version="10.2.3" />
     <PackageReference Include="Asp.Versioning.Mvc.ApiExplorer" Version="10.2.1" />
 
     <Using Include="Asp.Versioning" />
-</ItemGroup>
+  </ItemGroup>
 
-<!-- API Documentation -->
+  <!-- API Documentation -->
-<ItemGroup>
+  <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="10.0.12" />
     <PackageReference Include="Scalar.AspNetCore" Version="2.17.4" />
 
     <Using Include="Scalar.AspNetCore" />
     <Using Include="Microsoft.OpenApi" />
     <Using Include="Microsoft.AspNetCore.OpenApi" />
-</ItemGroup>
+  </ItemGroup>
 
-<!-- Quartz Scheduler-->
+  <!-- Quartz Scheduler-->
-<ItemGroup>    
+  <ItemGroup>
     <PackageReference Include="Hashids.net" Version="1.7.0" />
     <PackageReference Include="Meziantou.Analyzer" Version="3.0.259">
       <PrivateAssets>all</PrivateAssets>
@@ -96,10 +96,10 @@
 
     <!-- Global Usings -->
     <Using Include="Quartz" />
-</ItemGroup>
+  </ItemGroup>
 
-<!-- Configuration -->
+  <!-- Configuration -->
-<ItemGroup>
+  <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.12" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.12" />
     <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.12" />
@@ -108,10 +108,10 @@
 
     <!-- Global Usings -->
     <Using Include="Microsoft.Extensions.Configuration" />
-</ItemGroup>
+  </ItemGroup>
 
-<!-- Health Checks -->
+  <!-- Health Checks -->
-<ItemGroup>
+  <ItemGroup>
     <PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="9.0.0" />
     <PackageReference Include="AspNetCore.HealthChecks.UI" Version="9.0.0" />
     <PackageReference Include="AspNetCore.HealthChecks.UI.Core" Version="9.0.0" />
@@ -124,10 +124,10 @@
     <!-- Global Usings -->
     <Using Include="Microsoft.Extensions.Diagnostics.HealthChecks" />
     <Using Include="Microsoft.AspNetCore.Diagnostics.HealthChecks" />
-</ItemGroup>
+  </ItemGroup>
 
-<!-- Open Telemetry -->
+  <!-- Open Telemetry -->
-<ItemGroup>
+  <ItemGroup>
     <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.18.0" />
     <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.18.0" />
     <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.18.0" />
@@ -141,10 +141,10 @@
     <Using Include="OpenTelemetry.Logs" />
     <Using Include="OpenTelemetry.Metrics" />
     <Using Include="OpenTelemetry.Trace" />
-</ItemGroup>
+  </ItemGroup>
 
-<!-- Database -->
+  <!-- Database -->
-<ItemGroup>
+  <ItemGroup>
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.12" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.12">
       <PrivateAssets>all</PrivateAssets>
@@ -164,30 +164,30 @@
     <Using Include="Microsoft.EntityFrameworkCore" />
     <Using Include="Microsoft.EntityFrameworkCore.Design" />
     <Using Include="Microsoft.EntityFrameworkCore.Metadata.Builders" />
-</ItemGroup>
+  </ItemGroup>
 
-<!-- Email -->
+  <!-- Email -->
-<ItemGroup>
+  <ItemGroup>
     <PackageReference Include="MailKit" Version="4.18.0" />
     <PackageReference Include="MimeKit" Version="4.18.0" />
 
     <!-- Global Usings-->
     <Using Include="MimeKit" />
     <Using Include="MailKit.Net.Smtp" />
-</ItemGroup>
+  </ItemGroup>
 
-<!-- CQRS -->
+  <!-- CQRS -->
-<ItemGroup>
+  <ItemGroup>
     <PackageReference Include="FluentResults" Version="4.0.0" />
     <PackageReference Include="Mediator.Abstractions" Version="3.0.2" />
 
     <!-- Global Usings -->
     <Using Include="FluentResults" />
     <Using Include="Mediator" />
-</ItemGroup>
+  </ItemGroup>
 
-<!-- Amazon S3 SDK -->
+  <!-- Amazon S3 SDK -->
-<ItemGroup>
+  <ItemGroup>
     <PackageReference Include="AWSSDK.Extensions.NetCore.Setup" Version="4.0.101.4" />
     <PackageReference Include="AWSSDK.S3" Version="4.0.103.3" />
 
@@ -195,10 +195,15 @@
     <Using Include="Amazon.S3" />
     <Using Include="Amazon.S3.Model" />
     <Using Include="Amazon.Runtime" />
-</ItemGroup>
+  </ItemGroup>
 
-<!-- Shared Usings -->
+  <!-- Shared Static Usings -->
-<ItemGroup>
+  <ItemGroup>
+    <Using Static="true" Include="PostFundManagement.Domain.Extensions.Constants" />
+  </ItemGroup>
+
+  <!-- Shared Usings -->
+  <ItemGroup>
     <Using Include="System.ComponentModel.DataAnnotations.Schema" />
     <Using Include="Microsoft.AspNetCore.DataProtection" />
     <Using Include="System.Security.Cryptography.X509Certificates" />
@@ -224,6 +229,6 @@
     <Using Include="System.Security.Cryptography" />
     <Using Include="Microsoft.Extensions.Options" />
     <Using Include="Microsoft.Extensions.Logging" />
-</ItemGroup>
+  </ItemGroup>
 
 </Project>

PostFundManagement.Infrastructure/Database/Factories/ApplicationDbContextFactory.cs

@@ -1,5 +1,3 @@
-using static PostFundManagement.Domain.Extensions.Constants;
-
 namespace PostFundManagement.Infrastructure.Database.Factories;
 
 public sealed partial class ApplicationDbContextFactory : IDesignTimeDbContextFactory<ApplicationDbContext>

PostFundManagement.Infrastructure/Database/Factories/DataProtectionDbContextFactory.cs

@@ -1,5 +1,3 @@
-using static PostFundManagement.Domain.Extensions.Constants;
-
 namespace PostFundManagement.Infrastructure.Database.Factories;
 
 public sealed class DataProtectionDbContextFactory : IDesignTimeDbContextFactory<DataProtectionDbContext>

PostFundManagement.Infrastructure/PostFundManagement.Infrastructure.csproj

@@ -34,6 +34,11 @@
     <Using Include="Microsoft.EntityFrameworkCore.Design" />
   </ItemGroup>
 
+  <!-- Shared Static Usings -->
+  <ItemGroup>
+    <Using Static="true" Include="PostFundManagement.Domain.Extensions.Constants" />
+  </ItemGroup>
+
   <!-- Extensions -->
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.12" />

PostFundManagement.Infrastructure/Security/SkorubaUserService.cs

@@ -1,7 +1,6 @@
 using PostFundManagement.Domain.Abstractions;
 using PostFundManagement.Domain.Errors;
 using PostFundManagement.Domain.Models.Security;
-using static PostFundManagement.Domain.Extensions.Constants;
 
 namespace PostFundManagement.Infrastructure.Security;