From 1ebd83a2f49dafb78e7f2faf7364fbcb80d372cf Mon Sep 17 00:00:00 2001 From: Hermes Agent Date: Mon, 5 Oct 2026 08:57:39 +0200 Subject: [PATCH] Removed repetetive static usings and aliases --- .../PostFundManagement.Api.csproj | 2 +- .../Abstractions/Services/IToolService.cs | 6 - .../Extensions/Postgres.cs | 1 - .../Extensions/Quartz.cs | 1 - .../Extensions/S3.cs | 1 - .../Extensions/Security.cs | 1 - .../Filters/ActiveUserFilter.cs | 2 - .../Filters/UserRoleFilter.cs | 1 - .../PostFundManagement.Application.csproj | 6 + .../CommunicationsCacheService.cs | 1 - .../Services/Communications/Records.cs | 1 - .../Services/Evidence/EvidenceCacheService.cs | 1 - .../Services/Evidence/Records.cs | 1 - .../Execution/ExecutionCacheService.cs | 1 - .../Services/Execution/Records.cs | 1 - .../Governance/GovernanceCacheService.cs | 1 - .../Services/Governance/Records.cs | 1 - .../Services/Grants/GrantsCacheService.cs | 1 - .../Services/Grants/Records.cs | 1 - .../Services/Projects/ProjectCacheService.cs | 1 - .../Services/Projects/Records.cs | 1 - .../Services/Shared/GeneralS3Service.cs | 1 - .../Services/Users/UserCacheService.cs | 1 - .../Entities/Activity.cs | 1 - .../Entities/AuditLog.cs | 2 - .../Entities/Beneficiary.cs | 1 - PostFundManagement.Domain/Entities/Budget.cs | 1 - .../Entities/ChangeRequest.cs | 1 - .../Entities/ComplianceItem.cs | 1 - .../Entities/Indicator.cs | 1 - .../Entities/Instrument.cs | 1 - PostFundManagement.Domain/Entities/Issue.cs | 1 - .../Entities/Milestone.cs | 1 - .../Entities/Notification.cs | 1 - .../Entities/Organisation.cs | 2 - PostFundManagement.Domain/Entities/Outcome.cs | 1 - .../Entities/Portfolio.cs | 1 - .../Entities/Programme.cs | 1 - PostFundManagement.Domain/Entities/Project.cs | 1 - PostFundManagement.Domain/Entities/Risk.cs | 1 - PostFundManagement.Domain/Entities/Rule.cs | 1 - .../Entities/SiteVisit.cs | 1 - PostFundManagement.Domain/Entities/Tenant.cs | 4 +- PostFundManagement.Domain/Entities/User.cs | 2 - PostFundManagement.Domain/Enums.cs | 28 +- .../Health/PostgresHealthCheck.cs | 2 - .../Health/QuartzHealthCheck.cs | 2 - .../Models/Security/Contracts.cs | 6 +- .../PostFundManagement.Domain.csproj | 353 +++++++++--------- .../Factories/ApplicationDbContextFactory.cs | 2 - .../DataProtectionDbContextFactory.cs | 2 - .../PostFundManagement.Infrastructure.csproj | 5 + .../Security/SkorubaUserService.cs | 1 - 53 files changed, 209 insertions(+), 254 deletions(-) delete mode 100644 PostFundManagement.Application/Abstractions/Services/IToolService.cs diff --git a/PostFundManagement.Api/PostFundManagement.Api.csproj b/PostFundManagement.Api/PostFundManagement.Api.csproj index 26284aa..ef0be7e 100644 --- a/PostFundManagement.Api/PostFundManagement.Api.csproj +++ b/PostFundManagement.Api/PostFundManagement.Api.csproj @@ -90,7 +90,7 @@ - + diff --git a/PostFundManagement.Application/Abstractions/Services/IToolService.cs b/PostFundManagement.Application/Abstractions/Services/IToolService.cs deleted file mode 100644 index c848b6f..0000000 --- a/PostFundManagement.Application/Abstractions/Services/IToolService.cs +++ /dev/null @@ -1,6 +0,0 @@ -namespace PostFundManagement.Application.Abstractions.Services; - -public interface IToolService -{ - Task> EncodeLong(long id, CancellationToken cancellationToken); -} diff --git a/PostFundManagement.Application/Extensions/Postgres.cs b/PostFundManagement.Application/Extensions/Postgres.cs index ef640a8..4fa1a83 100644 --- a/PostFundManagement.Application/Extensions/Postgres.cs +++ b/PostFundManagement.Application/Extensions/Postgres.cs @@ -1,5 +1,4 @@ using PostFundManagement.Infrastructure.Database; -using static PostFundManagement.Domain.Extensions.Constants; namespace PostFundManagement.Application.Extensions; diff --git a/PostFundManagement.Application/Extensions/Quartz.cs b/PostFundManagement.Application/Extensions/Quartz.cs index 8ae2777..3dbdb82 100644 --- a/PostFundManagement.Application/Extensions/Quartz.cs +++ b/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; diff --git a/PostFundManagement.Application/Extensions/S3.cs b/PostFundManagement.Application/Extensions/S3.cs index 89d39d8..38a5e0a 100644 --- a/PostFundManagement.Application/Extensions/S3.cs +++ b/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; diff --git a/PostFundManagement.Application/Extensions/Security.cs b/PostFundManagement.Application/Extensions/Security.cs index 5e6545a..434220b 100644 --- a/PostFundManagement.Application/Extensions/Security.cs +++ b/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; diff --git a/PostFundManagement.Application/Filters/ActiveUserFilter.cs b/PostFundManagement.Application/Filters/ActiveUserFilter.cs index dba5679..19c3e0c 100644 --- a/PostFundManagement.Application/Filters/ActiveUserFilter.cs +++ b/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; diff --git a/PostFundManagement.Application/Filters/UserRoleFilter.cs b/PostFundManagement.Application/Filters/UserRoleFilter.cs index ca54e14..55b0c99 100644 --- a/PostFundManagement.Application/Filters/UserRoleFilter.cs +++ b/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; diff --git a/PostFundManagement.Application/PostFundManagement.Application.csproj b/PostFundManagement.Application/PostFundManagement.Application.csproj index 44bdc83..96108ea 100644 --- a/PostFundManagement.Application/PostFundManagement.Application.csproj +++ b/PostFundManagement.Application/PostFundManagement.Application.csproj @@ -36,6 +36,12 @@ + + + + + + diff --git a/PostFundManagement.Application/Services/Communications/CommunicationsCacheService.cs b/PostFundManagement.Application/Services/Communications/CommunicationsCacheService.cs index ced8a19..a4d1300 100644 --- a/PostFundManagement.Application/Services/Communications/CommunicationsCacheService.cs +++ b/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; diff --git a/PostFundManagement.Application/Services/Communications/Records.cs b/PostFundManagement.Application/Services/Communications/Records.cs index 706df2f..93e340c 100644 --- a/PostFundManagement.Application/Services/Communications/Records.cs +++ b/PostFundManagement.Application/Services/Communications/Records.cs @@ -1,5 +1,4 @@ using PostFundManagement.Domain; -using static PostFundManagement.Domain.Extensions.Constants; namespace PostFundManagement.Application.Services.Communications; diff --git a/PostFundManagement.Application/Services/Evidence/EvidenceCacheService.cs b/PostFundManagement.Application/Services/Evidence/EvidenceCacheService.cs index 91f386d..3be2893 100644 --- a/PostFundManagement.Application/Services/Evidence/EvidenceCacheService.cs +++ b/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; diff --git a/PostFundManagement.Application/Services/Evidence/Records.cs b/PostFundManagement.Application/Services/Evidence/Records.cs index 7bfc003..c03a29f 100644 --- a/PostFundManagement.Application/Services/Evidence/Records.cs +++ b/PostFundManagement.Application/Services/Evidence/Records.cs @@ -1,5 +1,4 @@ using PostFundManagement.Domain; -using static PostFundManagement.Domain.Extensions.Constants; namespace PostFundManagement.Application.Services.Evidence; diff --git a/PostFundManagement.Application/Services/Execution/ExecutionCacheService.cs b/PostFundManagement.Application/Services/Execution/ExecutionCacheService.cs index 032afef..c229cd4 100644 --- a/PostFundManagement.Application/Services/Execution/ExecutionCacheService.cs +++ b/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; diff --git a/PostFundManagement.Application/Services/Execution/Records.cs b/PostFundManagement.Application/Services/Execution/Records.cs index 81b466e..1f17eaa 100644 --- a/PostFundManagement.Application/Services/Execution/Records.cs +++ b/PostFundManagement.Application/Services/Execution/Records.cs @@ -1,5 +1,4 @@ using PostFundManagement.Domain; -using static PostFundManagement.Domain.Extensions.Constants; namespace PostFundManagement.Application.Services.Execution; diff --git a/PostFundManagement.Application/Services/Governance/GovernanceCacheService.cs b/PostFundManagement.Application/Services/Governance/GovernanceCacheService.cs index 030fcc7..8deb7fd 100644 --- a/PostFundManagement.Application/Services/Governance/GovernanceCacheService.cs +++ b/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; diff --git a/PostFundManagement.Application/Services/Governance/Records.cs b/PostFundManagement.Application/Services/Governance/Records.cs index d37e3e1..a8f3d7c 100644 --- a/PostFundManagement.Application/Services/Governance/Records.cs +++ b/PostFundManagement.Application/Services/Governance/Records.cs @@ -1,5 +1,4 @@ using PostFundManagement.Domain; -using static PostFundManagement.Domain.Extensions.Constants; namespace PostFundManagement.Application.Services.Governance; diff --git a/PostFundManagement.Application/Services/Grants/GrantsCacheService.cs b/PostFundManagement.Application/Services/Grants/GrantsCacheService.cs index e8c3bb1..ef14bed 100644 --- a/PostFundManagement.Application/Services/Grants/GrantsCacheService.cs +++ b/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; diff --git a/PostFundManagement.Application/Services/Grants/Records.cs b/PostFundManagement.Application/Services/Grants/Records.cs index c8f5ebe..fbe18c5 100644 --- a/PostFundManagement.Application/Services/Grants/Records.cs +++ b/PostFundManagement.Application/Services/Grants/Records.cs @@ -1,5 +1,4 @@ using PostFundManagement.Domain; -using static PostFundManagement.Domain.Extensions.Constants; namespace PostFundManagement.Application.Services.Grants; diff --git a/PostFundManagement.Application/Services/Projects/ProjectCacheService.cs b/PostFundManagement.Application/Services/Projects/ProjectCacheService.cs index 392f91b..9f7adbf 100644 --- a/PostFundManagement.Application/Services/Projects/ProjectCacheService.cs +++ b/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; diff --git a/PostFundManagement.Application/Services/Projects/Records.cs b/PostFundManagement.Application/Services/Projects/Records.cs index 17fba04..87cf9ed 100644 --- a/PostFundManagement.Application/Services/Projects/Records.cs +++ b/PostFundManagement.Application/Services/Projects/Records.cs @@ -1,5 +1,4 @@ using PostFundManagement.Domain; -using static PostFundManagement.Domain.Extensions.Constants; namespace PostFundManagement.Application.Services.Projects; diff --git a/PostFundManagement.Application/Services/Shared/GeneralS3Service.cs b/PostFundManagement.Application/Services/Shared/GeneralS3Service.cs index 7aede7c..1b24434 100644 --- a/PostFundManagement.Application/Services/Shared/GeneralS3Service.cs +++ b/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; diff --git a/PostFundManagement.Application/Services/Users/UserCacheService.cs b/PostFundManagement.Application/Services/Users/UserCacheService.cs index 9c25c7b..312383b 100644 --- a/PostFundManagement.Application/Services/Users/UserCacheService.cs +++ b/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; diff --git a/PostFundManagement.Domain/Entities/Activity.cs b/PostFundManagement.Domain/Entities/Activity.cs index b2c059f..a6fe592 100644 --- a/PostFundManagement.Domain/Entities/Activity.cs +++ b/PostFundManagement.Domain/Entities/Activity.cs @@ -1,5 +1,4 @@ using PostFundManagement.Domain.Abstractions; -using static PostFundManagement.Domain.Extensions.Constants; namespace PostFundManagement.Domain.Entities; diff --git a/PostFundManagement.Domain/Entities/AuditLog.cs b/PostFundManagement.Domain/Entities/AuditLog.cs index cb70df6..4febf16 100644 --- a/PostFundManagement.Domain/Entities/AuditLog.cs +++ b/PostFundManagement.Domain/Entities/AuditLog.cs @@ -1,5 +1,3 @@ -using static PostFundManagement.Domain.Extensions.Constants; - namespace PostFundManagement.Domain.Entities; [EntityTypeConfiguration] diff --git a/PostFundManagement.Domain/Entities/Beneficiary.cs b/PostFundManagement.Domain/Entities/Beneficiary.cs index e9e2d0f..9737fd4 100644 --- a/PostFundManagement.Domain/Entities/Beneficiary.cs +++ b/PostFundManagement.Domain/Entities/Beneficiary.cs @@ -1,5 +1,4 @@ using PostFundManagement.Domain.Abstractions; -using static PostFundManagement.Domain.Extensions.Constants; namespace PostFundManagement.Domain.Entities; diff --git a/PostFundManagement.Domain/Entities/Budget.cs b/PostFundManagement.Domain/Entities/Budget.cs index 7123756..099946d 100644 --- a/PostFundManagement.Domain/Entities/Budget.cs +++ b/PostFundManagement.Domain/Entities/Budget.cs @@ -1,5 +1,4 @@ using PostFundManagement.Domain.Abstractions; -using static PostFundManagement.Domain.Extensions.Constants; namespace PostFundManagement.Domain.Entities; diff --git a/PostFundManagement.Domain/Entities/ChangeRequest.cs b/PostFundManagement.Domain/Entities/ChangeRequest.cs index a95c84a..c885093 100644 --- a/PostFundManagement.Domain/Entities/ChangeRequest.cs +++ b/PostFundManagement.Domain/Entities/ChangeRequest.cs @@ -1,5 +1,4 @@ using PostFundManagement.Domain.Abstractions; -using static PostFundManagement.Domain.Extensions.Constants; namespace PostFundManagement.Domain.Entities; diff --git a/PostFundManagement.Domain/Entities/ComplianceItem.cs b/PostFundManagement.Domain/Entities/ComplianceItem.cs index e67faa2..9660313 100644 --- a/PostFundManagement.Domain/Entities/ComplianceItem.cs +++ b/PostFundManagement.Domain/Entities/ComplianceItem.cs @@ -1,5 +1,4 @@ using PostFundManagement.Domain.Abstractions; -using static PostFundManagement.Domain.Extensions.Constants; namespace PostFundManagement.Domain.Entities; diff --git a/PostFundManagement.Domain/Entities/Indicator.cs b/PostFundManagement.Domain/Entities/Indicator.cs index 1215875..b31d03e 100644 --- a/PostFundManagement.Domain/Entities/Indicator.cs +++ b/PostFundManagement.Domain/Entities/Indicator.cs @@ -1,5 +1,4 @@ using PostFundManagement.Domain.Abstractions; -using static PostFundManagement.Domain.Extensions.Constants; namespace PostFundManagement.Domain.Entities; diff --git a/PostFundManagement.Domain/Entities/Instrument.cs b/PostFundManagement.Domain/Entities/Instrument.cs index 85453ed..6adf209 100644 --- a/PostFundManagement.Domain/Entities/Instrument.cs +++ b/PostFundManagement.Domain/Entities/Instrument.cs @@ -1,5 +1,4 @@ using PostFundManagement.Domain.Abstractions; -using static PostFundManagement.Domain.Extensions.Constants; namespace PostFundManagement.Domain.Entities; diff --git a/PostFundManagement.Domain/Entities/Issue.cs b/PostFundManagement.Domain/Entities/Issue.cs index 47c132a..48be6f9 100644 --- a/PostFundManagement.Domain/Entities/Issue.cs +++ b/PostFundManagement.Domain/Entities/Issue.cs @@ -1,5 +1,4 @@ using PostFundManagement.Domain.Abstractions; -using static PostFundManagement.Domain.Extensions.Constants; namespace PostFundManagement.Domain.Entities; diff --git a/PostFundManagement.Domain/Entities/Milestone.cs b/PostFundManagement.Domain/Entities/Milestone.cs index 85a9581..142a00b 100644 --- a/PostFundManagement.Domain/Entities/Milestone.cs +++ b/PostFundManagement.Domain/Entities/Milestone.cs @@ -1,5 +1,4 @@ using PostFundManagement.Domain.Abstractions; -using static PostFundManagement.Domain.Extensions.Constants; namespace PostFundManagement.Domain.Entities; diff --git a/PostFundManagement.Domain/Entities/Notification.cs b/PostFundManagement.Domain/Entities/Notification.cs index 1da94a1..7ce906b 100644 --- a/PostFundManagement.Domain/Entities/Notification.cs +++ b/PostFundManagement.Domain/Entities/Notification.cs @@ -1,5 +1,4 @@ using PostFundManagement.Domain.Abstractions; -using static PostFundManagement.Domain.Extensions.Constants; namespace PostFundManagement.Domain.Entities; diff --git a/PostFundManagement.Domain/Entities/Organisation.cs b/PostFundManagement.Domain/Entities/Organisation.cs index fce062b..8d0df3a 100644 --- a/PostFundManagement.Domain/Entities/Organisation.cs +++ b/PostFundManagement.Domain/Entities/Organisation.cs @@ -1,5 +1,3 @@ -using static PostFundManagement.Domain.Extensions.Constants; - namespace PostFundManagement.Domain.Entities; [EntityTypeConfiguration] diff --git a/PostFundManagement.Domain/Entities/Outcome.cs b/PostFundManagement.Domain/Entities/Outcome.cs index fbd8358..8991a8a 100644 --- a/PostFundManagement.Domain/Entities/Outcome.cs +++ b/PostFundManagement.Domain/Entities/Outcome.cs @@ -1,5 +1,4 @@ using PostFundManagement.Domain.Abstractions; -using static PostFundManagement.Domain.Extensions.Constants; namespace PostFundManagement.Domain.Entities; diff --git a/PostFundManagement.Domain/Entities/Portfolio.cs b/PostFundManagement.Domain/Entities/Portfolio.cs index 76643b2..34cee15 100644 --- a/PostFundManagement.Domain/Entities/Portfolio.cs +++ b/PostFundManagement.Domain/Entities/Portfolio.cs @@ -1,5 +1,4 @@ using PostFundManagement.Domain.Abstractions; -using static PostFundManagement.Domain.Extensions.Constants; namespace PostFundManagement.Domain.Entities; diff --git a/PostFundManagement.Domain/Entities/Programme.cs b/PostFundManagement.Domain/Entities/Programme.cs index 7f5f25f..2388bc8 100644 --- a/PostFundManagement.Domain/Entities/Programme.cs +++ b/PostFundManagement.Domain/Entities/Programme.cs @@ -1,5 +1,4 @@ using PostFundManagement.Domain.Abstractions; -using static PostFundManagement.Domain.Extensions.Constants; namespace PostFundManagement.Domain.Entities; diff --git a/PostFundManagement.Domain/Entities/Project.cs b/PostFundManagement.Domain/Entities/Project.cs index fb4612f..1a5c962 100644 --- a/PostFundManagement.Domain/Entities/Project.cs +++ b/PostFundManagement.Domain/Entities/Project.cs @@ -1,5 +1,4 @@ using PostFundManagement.Domain.Abstractions; -using static PostFundManagement.Domain.Extensions.Constants; namespace PostFundManagement.Domain.Entities; diff --git a/PostFundManagement.Domain/Entities/Risk.cs b/PostFundManagement.Domain/Entities/Risk.cs index 0591cc6..7c94d1f 100644 --- a/PostFundManagement.Domain/Entities/Risk.cs +++ b/PostFundManagement.Domain/Entities/Risk.cs @@ -1,5 +1,4 @@ using PostFundManagement.Domain.Abstractions; -using static PostFundManagement.Domain.Extensions.Constants; namespace PostFundManagement.Domain.Entities; diff --git a/PostFundManagement.Domain/Entities/Rule.cs b/PostFundManagement.Domain/Entities/Rule.cs index e4ae1b4..c4688eb 100644 --- a/PostFundManagement.Domain/Entities/Rule.cs +++ b/PostFundManagement.Domain/Entities/Rule.cs @@ -1,5 +1,4 @@ using PostFundManagement.Domain.Abstractions; -using static PostFundManagement.Domain.Extensions.Constants; namespace PostFundManagement.Domain.Entities; diff --git a/PostFundManagement.Domain/Entities/SiteVisit.cs b/PostFundManagement.Domain/Entities/SiteVisit.cs index eee8e43..ad2b6ed 100644 --- a/PostFundManagement.Domain/Entities/SiteVisit.cs +++ b/PostFundManagement.Domain/Entities/SiteVisit.cs @@ -1,5 +1,4 @@ using PostFundManagement.Domain.Abstractions; -using static PostFundManagement.Domain.Extensions.Constants; namespace PostFundManagement.Domain.Entities; diff --git a/PostFundManagement.Domain/Entities/Tenant.cs b/PostFundManagement.Domain/Entities/Tenant.cs index 6bab5aa..58582dc 100644 --- a/PostFundManagement.Domain/Entities/Tenant.cs +++ b/PostFundManagement.Domain/Entities/Tenant.cs @@ -1,6 +1,4 @@ -using static PostFundManagement.Domain.Extensions.Constants; - -namespace PostFundManagement.Domain.Entities; +namespace PostFundManagement.Domain.Entities; [EntityTypeConfiguration] public class Tenant : Models.Tenant diff --git a/PostFundManagement.Domain/Entities/User.cs b/PostFundManagement.Domain/Entities/User.cs index 270427f..00be259 100644 --- a/PostFundManagement.Domain/Entities/User.cs +++ b/PostFundManagement.Domain/Entities/User.cs @@ -1,5 +1,3 @@ -using static PostFundManagement.Domain.Extensions.Constants; - namespace PostFundManagement.Domain.Entities; [EntityTypeConfiguration] diff --git a/PostFundManagement.Domain/Enums.cs b/PostFundManagement.Domain/Enums.cs index 7482db7..bb75ca1 100644 --- a/PostFundManagement.Domain/Enums.cs +++ b/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, } \ No newline at end of file diff --git a/PostFundManagement.Domain/Health/PostgresHealthCheck.cs b/PostFundManagement.Domain/Health/PostgresHealthCheck.cs index 39b58ce..003572f 100644 --- a/PostFundManagement.Domain/Health/PostgresHealthCheck.cs +++ b/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 diff --git a/PostFundManagement.Domain/Health/QuartzHealthCheck.cs b/PostFundManagement.Domain/Health/QuartzHealthCheck.cs index e66b880..78090a4 100644 --- a/PostFundManagement.Domain/Health/QuartzHealthCheck.cs +++ b/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 diff --git a/PostFundManagement.Domain/Models/Security/Contracts.cs b/PostFundManagement.Domain/Models/Security/Contracts.cs index bfbf504..8c8588f 100644 --- a/PostFundManagement.Domain/Models/Security/Contracts.cs +++ b/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 Claims); +public sealed record ClaimsResponse(int TotalCount, int PageSize, ICollection 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 Roles); \ No newline at end of file +public sealed record RolesResponse(int TotalCount, int PageSize, ICollection Roles); \ No newline at end of file diff --git a/PostFundManagement.Domain/PostFundManagement.Domain.csproj b/PostFundManagement.Domain/PostFundManagement.Domain.csproj index e1690af..80faa44 100644 --- a/PostFundManagement.Domain/PostFundManagement.Domain.csproj +++ b/PostFundManagement.Domain/PostFundManagement.Domain.csproj @@ -25,205 +25,210 @@ - + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - + + + + + + + + - - - + + + - - + + - - - - - - + + + + + + - - + + - - - - + + + + - - - - + + + + - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - - - + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + + + - - - + + + - - - - - - - + + + + + + + - - - + + + - - - - - - - - - - + + + + + + + + + + - - - - + + + + - - - - - - - - + + + + + + + + - - - - - - - + + + + + + + - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + - - - - - - - + + + + + + + - - - - - - - - - + + + + - - - - + + + + - - - - + + + + - - - - - - - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/PostFundManagement.Infrastructure/Database/Factories/ApplicationDbContextFactory.cs b/PostFundManagement.Infrastructure/Database/Factories/ApplicationDbContextFactory.cs index 6046775..eae18cf 100644 --- a/PostFundManagement.Infrastructure/Database/Factories/ApplicationDbContextFactory.cs +++ b/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 diff --git a/PostFundManagement.Infrastructure/Database/Factories/DataProtectionDbContextFactory.cs b/PostFundManagement.Infrastructure/Database/Factories/DataProtectionDbContextFactory.cs index b54ff53..8ea22a5 100644 --- a/PostFundManagement.Infrastructure/Database/Factories/DataProtectionDbContextFactory.cs +++ b/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 diff --git a/PostFundManagement.Infrastructure/PostFundManagement.Infrastructure.csproj b/PostFundManagement.Infrastructure/PostFundManagement.Infrastructure.csproj index 4d741b3..6451b3a 100644 --- a/PostFundManagement.Infrastructure/PostFundManagement.Infrastructure.csproj +++ b/PostFundManagement.Infrastructure/PostFundManagement.Infrastructure.csproj @@ -34,6 +34,11 @@ + + + + + diff --git a/PostFundManagement.Infrastructure/Security/SkorubaUserService.cs b/PostFundManagement.Infrastructure/Security/SkorubaUserService.cs index 8389656..1def22d 100644 --- a/PostFundManagement.Infrastructure/Security/SkorubaUserService.cs +++ b/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;