From 0f7f875abe50be848efc6deaa96981382d0dccf5 Mon Sep 17 00:00:00 2001 From: Hermes Agent Date: Sun, 30 Aug 2026 14:49:10 +0200 Subject: [PATCH 1/2] Moved DI extensions to Appl;ication layer --- .../Communications/GetInvitesEndpoint.cs | 2 +- PostFundManagement.Api/Program.cs | 1 - .../Api/Filters/ActiveUserFilter.cs | 2 +- .../Communications/Events/SyncUserEvent.cs | 10 ++++++ .../Events/SyncUserEventHandler.cs | 11 ------- .../Extensions/General.cs | 29 ++++++++++++++++ .../Extensions/Otel.cs | 8 ++++- .../Extensions/Postgres.cs | 2 +- .../Extensions/Quartz.cs | 0 .../Extensions/Security.cs | 3 +- .../Api}/Configuration/MachineIdentity.cs | 2 +- .../Extensions/General.cs | 33 ------------------- 12 files changed, 51 insertions(+), 52 deletions(-) delete mode 100644 PostFundManagement.Application/Communications/Events/SyncUserEventHandler.cs rename {PostFundManagement.Domain => PostFundManagement.Application}/Extensions/Otel.cs (90%) rename {PostFundManagement.Api => PostFundManagement.Application}/Extensions/Postgres.cs (95%) rename {PostFundManagement.Domain => PostFundManagement.Application}/Extensions/Quartz.cs (100%) rename {PostFundManagement.Api => PostFundManagement.Application}/Extensions/Security.cs (98%) rename {PostFundManagement.Infrastructure => PostFundManagement.Domain/Api}/Configuration/MachineIdentity.cs (78%) delete mode 100644 PostFundManagement.Domain/Extensions/General.cs diff --git a/PostFundManagement.Api/Endpoints/Communications/GetInvitesEndpoint.cs b/PostFundManagement.Api/Endpoints/Communications/GetInvitesEndpoint.cs index 48dc0ef..851e83d 100644 --- a/PostFundManagement.Api/Endpoints/Communications/GetInvitesEndpoint.cs +++ b/PostFundManagement.Api/Endpoints/Communications/GetInvitesEndpoint.cs @@ -5,7 +5,7 @@ using PostFundManagement.Domain.Abstractions; using PostFundManagement.Domain.Api; using PostFundManagement.Domain.Extensions; using PostFundManagement.Domain.Models; -using static PostFundManagement.Domain.Extensions.General; +using static PostFundManagement.Application.Extensions.General; namespace PostFundManagement.Api.Endpoints.Communications; diff --git a/PostFundManagement.Api/Program.cs b/PostFundManagement.Api/Program.cs index bd90260..92f6836 100644 --- a/PostFundManagement.Api/Program.cs +++ b/PostFundManagement.Api/Program.cs @@ -1,4 +1,3 @@ -using PostFundManagement.Api.Extensions; using PostFundManagement.Application.Api.Filters; using PostFundManagement.Application.Extensions; using PostFundManagement.Domain.Extensions; diff --git a/PostFundManagement.Application/Api/Filters/ActiveUserFilter.cs b/PostFundManagement.Application/Api/Filters/ActiveUserFilter.cs index 6d8e45b..060a208 100644 --- a/PostFundManagement.Application/Api/Filters/ActiveUserFilter.cs +++ b/PostFundManagement.Application/Api/Filters/ActiveUserFilter.cs @@ -1,5 +1,5 @@ using PostFundManagement.Application.Shared; -using static PostFundManagement.Domain.Extensions.General; +using static PostFundManagement.Application.Extensions.General; using static PostFundManagement.Domain.Extensions.Constants; namespace PostFundManagement.Application.Api.Filters; diff --git a/PostFundManagement.Application/Communications/Events/SyncUserEvent.cs b/PostFundManagement.Application/Communications/Events/SyncUserEvent.cs index 45a7f63..b5e83c4 100644 --- a/PostFundManagement.Application/Communications/Events/SyncUserEvent.cs +++ b/PostFundManagement.Application/Communications/Events/SyncUserEvent.cs @@ -7,3 +7,13 @@ public class SyncUserEvent : EventBase, IEvent { public string Name { get; set; } = nameof(SyncUserEvent); } + +public class SyncUserEventHandler(ILogger logger) : INotificationHandler +{ + public ValueTask Handle(SyncUserEvent notification, CancellationToken cancellationToken) + { + logger.LogInformation("Integration Sync executed. Correlation ID: {CorrelationId}", notification.CorrelationId); + + return ValueTask.CompletedTask; + } +} diff --git a/PostFundManagement.Application/Communications/Events/SyncUserEventHandler.cs b/PostFundManagement.Application/Communications/Events/SyncUserEventHandler.cs deleted file mode 100644 index 2290442..0000000 --- a/PostFundManagement.Application/Communications/Events/SyncUserEventHandler.cs +++ /dev/null @@ -1,11 +0,0 @@ -namespace PostFundManagement.Application.Communications.Events; - -public class SyncUserEventHandler(ILogger logger) : INotificationHandler -{ - public ValueTask Handle(SyncUserEvent notification, CancellationToken cancellationToken) - { - logger.LogInformation("Integration Sync executed. Correlation ID: {CorrelationId}", notification.CorrelationId); - - return ValueTask.CompletedTask; - } -} diff --git a/PostFundManagement.Application/Extensions/General.cs b/PostFundManagement.Application/Extensions/General.cs index c5bab52..a9969f4 100644 --- a/PostFundManagement.Application/Extensions/General.cs +++ b/PostFundManagement.Application/Extensions/General.cs @@ -16,4 +16,33 @@ public static class General return services; } + + public static Guid GetUserId(this HttpContext context) => (Guid)context.Items[Domain.Extensions.Constants.UserIdItemKey]!; + + public static string GetUserEmail(this HttpContext context) => (string)context.Items[Domain.Extensions.Constants.EmaiItemKey]!; + + public static (bool Decoded, Guid userId) GetUserId(this ClaimsPrincipal principal) + { + var sidClaim = principal.FindFirst("sid")?.Value ?? principal.FindFirst(ClaimTypes.Sid)?.Value; + + var decoded = Guid.TryParse(sidClaim, out var userId); + + return (decoded, userId); + } + + public static (bool Decoded, Guid email) GetUserEmail(this ClaimsPrincipal principal) + { + var emailClaim = principal.FindFirst("email")?.Value ?? principal.FindFirst(ClaimTypes.Email)?.Value; + + var decoded = Guid.TryParse(emailClaim, out var email); + + return (decoded, email); + } + + public static Microsoft.AspNetCore.Mvc.ProblemDetails ToProblems(this IReadOnlyList errors) => new() + { + Detail = string.Join(',', errors.Select(e => e.Message)), + Status = StatusCodes.Status400BadRequest, + Title = errors[0]?.Message, + }; } diff --git a/PostFundManagement.Domain/Extensions/Otel.cs b/PostFundManagement.Application/Extensions/Otel.cs similarity index 90% rename from PostFundManagement.Domain/Extensions/Otel.cs rename to PostFundManagement.Application/Extensions/Otel.cs index 41c0fb3..343d8a5 100644 --- a/PostFundManagement.Domain/Extensions/Otel.cs +++ b/PostFundManagement.Application/Extensions/Otel.cs @@ -1,4 +1,10 @@ -namespace PostFundManagement.Domain.Extensions; +using OpenTelemetry.Exporter; +using OpenTelemetry.Logs; +using OpenTelemetry.Resources; +using OpenTelemetry.Trace; +using OpenTelemetry.Metrics; + +namespace PostFundManagement.Application.Extensions; public static class Otel { diff --git a/PostFundManagement.Api/Extensions/Postgres.cs b/PostFundManagement.Application/Extensions/Postgres.cs similarity index 95% rename from PostFundManagement.Api/Extensions/Postgres.cs rename to PostFundManagement.Application/Extensions/Postgres.cs index 351b55f..ef640a8 100644 --- a/PostFundManagement.Api/Extensions/Postgres.cs +++ b/PostFundManagement.Application/Extensions/Postgres.cs @@ -1,7 +1,7 @@ using PostFundManagement.Infrastructure.Database; using static PostFundManagement.Domain.Extensions.Constants; -namespace PostFundManagement.Api.Extensions; +namespace PostFundManagement.Application.Extensions; public static class Postgres { diff --git a/PostFundManagement.Domain/Extensions/Quartz.cs b/PostFundManagement.Application/Extensions/Quartz.cs similarity index 100% rename from PostFundManagement.Domain/Extensions/Quartz.cs rename to PostFundManagement.Application/Extensions/Quartz.cs diff --git a/PostFundManagement.Api/Extensions/Security.cs b/PostFundManagement.Application/Extensions/Security.cs similarity index 98% rename from PostFundManagement.Api/Extensions/Security.cs rename to PostFundManagement.Application/Extensions/Security.cs index 5e13cb5..736aa40 100644 --- a/PostFundManagement.Api/Extensions/Security.cs +++ b/PostFundManagement.Application/Extensions/Security.cs @@ -1,10 +1,9 @@ -using PostFundManagement.Application.Extensions; using PostFundManagement.Application.Shared; using PostFundManagement.Domain.Api.Configuration; using PostFundManagement.Domain.Sdk; using PostFundManagement.Infrastructure.Database; -namespace PostFundManagement.Api.Extensions; +namespace PostFundManagement.Application.Extensions; public static class Security { diff --git a/PostFundManagement.Infrastructure/Configuration/MachineIdentity.cs b/PostFundManagement.Domain/Api/Configuration/MachineIdentity.cs similarity index 78% rename from PostFundManagement.Infrastructure/Configuration/MachineIdentity.cs rename to PostFundManagement.Domain/Api/Configuration/MachineIdentity.cs index 2434107..6811135 100644 --- a/PostFundManagement.Infrastructure/Configuration/MachineIdentity.cs +++ b/PostFundManagement.Domain/Api/Configuration/MachineIdentity.cs @@ -1,4 +1,4 @@ -namespace PostFundManagement.Infrastructure.Configuration; +namespace PostFundManagement.Domain.Api.Configuration; public sealed class MachineIdentity { diff --git a/PostFundManagement.Domain/Extensions/General.cs b/PostFundManagement.Domain/Extensions/General.cs deleted file mode 100644 index 542f6fe..0000000 --- a/PostFundManagement.Domain/Extensions/General.cs +++ /dev/null @@ -1,33 +0,0 @@ -namespace PostFundManagement.Domain.Extensions; - -public static class General -{ - public static Guid GetUserId(this HttpContext context) => (Guid)context.Items[Constants.UserIdItemKey]!; - - public static string GetUserEmail(this HttpContext context) => (string)context.Items[Constants.EmaiItemKey]!; - - public static (bool Decoded, Guid userId) GetUserId(this ClaimsPrincipal principal) - { - var sidClaim = principal.FindFirst("sid")?.Value ?? principal.FindFirst(ClaimTypes.Sid)?.Value; - - var decoded = Guid.TryParse(sidClaim, out var userId); - - return (decoded, userId); - } - - public static (bool Decoded, Guid email) GetUserEmail(this ClaimsPrincipal principal) - { - var emailClaim = principal.FindFirst("email")?.Value ?? principal.FindFirst(ClaimTypes.Email)?.Value; - - var decoded = Guid.TryParse(emailClaim, out var email); - - return (decoded, email); - } - - public static Microsoft.AspNetCore.Mvc.ProblemDetails ToProblems(this IReadOnlyList errors) => new() - { - Detail = string.Join(',', errors.Select(e => e.Message)), - Status = StatusCodes.Status400BadRequest, - Title = errors[0]?.Message, - }; -} -- 2.47.3 From c204cbb1c202597d2005101575df161a96730364 Mon Sep 17 00:00:00 2001 From: Hermes Agent Date: Sun, 30 Aug 2026 14:53:16 +0200 Subject: [PATCH 2/2] Moved service implemntations into Application.Services folder and namespace --- .../Endpoints/Communications/GetInvitesEndpoint.cs | 2 +- .../Endpoints/Communications/SendInviteEndpoint.cs | 2 +- .../Endpoints/Communications/SyncIdentityUserEndpoint.cs | 2 +- .../Endpoints/Evidence/CreateIndicatorEndpoint.cs | 2 +- .../Endpoints/Evidence/CreateMilestoneEndpoint.cs | 2 +- .../Endpoints/Evidence/GetEvidenceFilesEndpoint.cs | 2 +- .../Endpoints/Evidence/GetIndicatorsEndpoint.cs | 2 +- .../Endpoints/Evidence/GetMilestonesEndpoint.cs | 2 +- .../Endpoints/Evidence/GetProjectMilestonesEndpoint.cs | 2 +- .../Endpoints/Evidence/RecordIndicatorAmountEndpoint.cs | 2 +- .../Endpoints/Evidence/UploadEvidenceFilesEndpoint.cs | 2 +- .../Endpoints/Execution/ApproveDisbursementEndpoint.cs | 2 +- .../Endpoints/Execution/CreateDisbursementEndpoint.cs | 2 +- .../Endpoints/Execution/CreateRiskEndpoint.cs | 2 +- .../Endpoints/Execution/GetDisbursementsEndpoint.cs | 2 +- .../Endpoints/Execution/GetProjectRisksEndpoint.cs | 2 +- PostFundManagement.Api/Endpoints/Execution/GetRisksEndpoint.cs | 2 +- .../Endpoints/Governance/CreateOrganisationEndpoint.cs | 2 +- .../Endpoints/Governance/DashboardEndpoint.cs | 2 +- .../Endpoints/Governance/GetInstrumentsEndpoint.cs | 3 ++- .../Endpoints/Governance/GetOrganisationByIdEndpoint.cs | 2 +- .../Endpoints/Governance/GetOrganisationsEndpoint.cs | 2 +- .../Endpoints/Governance/GetPortfoliosEndpoint.cs | 2 +- .../Endpoints/Governance/GetProgrammesEndpoint.cs | 2 +- PostFundManagement.Api/Endpoints/Grants/CreateAwardEndpoint.cs | 2 +- .../Endpoints/Grants/CreateBudgetEndpoint.cs | 2 +- .../Endpoints/Grants/CreateContractEndpoint.cs | 2 +- .../Endpoints/Grants/ExecuteContractEndpoint.cs | 2 +- .../Endpoints/Grants/GetAwardByIdEndpoint.cs | 2 +- PostFundManagement.Api/Endpoints/Grants/GetAwardsEndpoint.cs | 2 +- .../Endpoints/Grants/GetBudgetByIdEndpoint.cs | 2 +- PostFundManagement.Api/Endpoints/Grants/GetBudgetsEndpoint.cs | 2 +- .../Endpoints/Grants/GetContractByIdEndpoint.cs | 2 +- .../Endpoints/Grants/GetContractsEndpoint.cs | 2 +- .../Endpoints/Projects/CreateActivityEndpoint.cs | 2 +- .../Endpoints/Projects/CreateProjectEndpoint.cs | 2 +- .../Endpoints/Projects/GetActivitiesEndpoint.cs | 2 +- .../Endpoints/Projects/GetProjectByIdEndpoint.cs | 2 +- .../Endpoints/Projects/GetProjectsEndpoint.cs | 2 +- .../Endpoints/Projects/UpdateProjectEndpoint.cs | 2 +- PostFundManagement.Api/Endpoints/Users/GetUsersEndpoint.cs | 2 +- PostFundManagement.Api/Endpoints/Users/SyncUserEndpoint.cs | 2 +- PostFundManagement.Application/Api/Filters/ActiveUserFilter.cs | 2 +- PostFundManagement.Application/Extensions/Email.cs | 2 +- PostFundManagement.Application/Extensions/S3.cs | 2 +- PostFundManagement.Application/Extensions/Security.cs | 2 +- .../{ => Services}/Communications/CommunicationsService.cs | 2 +- .../{ => Services}/Communications/Events/SyncUserEvent.cs | 2 +- .../{ => Services}/Communications/Records.cs | 2 +- .../{ => Services}/Evidence/EvidenceService.cs | 2 +- .../{ => Services}/Evidence/Records.cs | 2 +- .../{ => Services}/Execution/ExecutionService.cs | 2 +- .../{ => Services}/Execution/Records.cs | 2 +- .../{ => Services}/Governance/GovernanceService.cs | 2 +- .../{ => Services}/Governance/Records.cs | 2 +- .../{ => Services}/Grants/GrantsService.cs | 2 +- .../{ => Services}/Grants/Records.cs | 2 +- .../{ => Services}/Projects/ProjectService.cs | 2 +- .../{ => Services}/Projects/Records.cs | 2 +- .../{ => Services}/Shared/BrowserLocalStorageService.cs | 2 +- .../{ => Services}/Shared/ContractS3Service.cs | 2 +- .../{ => Services}/Shared/EmailService.cs | 2 +- .../{ => Services}/Shared/EvidenceS3Service.cs | 2 +- .../{ => Services}/Shared/GeneralS3Service.cs | 2 +- .../{ => Services}/Shared/HashService.cs | 0 .../{ => Services}/Shared/IdentityService.cs | 2 +- .../{ => Services}/Shared/TokenService.cs | 2 +- PostFundManagement.Application/{ => Services}/Users/Records.cs | 2 +- .../{ => Services}/Users/UserService.cs | 2 +- 69 files changed, 69 insertions(+), 68 deletions(-) rename PostFundManagement.Application/{ => Services}/Communications/CommunicationsService.cs (97%) rename PostFundManagement.Application/{ => Services}/Communications/Events/SyncUserEvent.cs (88%) rename PostFundManagement.Application/{ => Services}/Communications/Records.cs (76%) rename PostFundManagement.Application/{ => Services}/Evidence/EvidenceService.cs (99%) rename PostFundManagement.Application/{ => Services}/Evidence/Records.cs (85%) rename PostFundManagement.Application/{ => Services}/Execution/ExecutionService.cs (99%) rename PostFundManagement.Application/{ => Services}/Execution/Records.cs (80%) rename PostFundManagement.Application/{ => Services}/Governance/GovernanceService.cs (99%) rename PostFundManagement.Application/{ => Services}/Governance/Records.cs (83%) rename PostFundManagement.Application/{ => Services}/Grants/GrantsService.cs (99%) rename PostFundManagement.Application/{ => Services}/Grants/Records.cs (86%) rename PostFundManagement.Application/{ => Services}/Projects/ProjectService.cs (99%) rename PostFundManagement.Application/{ => Services}/Projects/Records.cs (87%) rename PostFundManagement.Application/{ => Services}/Shared/BrowserLocalStorageService.cs (97%) rename PostFundManagement.Application/{ => Services}/Shared/ContractS3Service.cs (90%) rename PostFundManagement.Application/{ => Services}/Shared/EmailService.cs (99%) rename PostFundManagement.Application/{ => Services}/Shared/EvidenceS3Service.cs (90%) rename PostFundManagement.Application/{ => Services}/Shared/GeneralS3Service.cs (90%) rename PostFundManagement.Application/{ => Services}/Shared/HashService.cs (100%) rename PostFundManagement.Application/{ => Services}/Shared/IdentityService.cs (93%) rename PostFundManagement.Application/{ => Services}/Shared/TokenService.cs (97%) rename PostFundManagement.Application/{ => Services}/Users/Records.cs (75%) rename PostFundManagement.Application/{ => Services}/Users/UserService.cs (98%) diff --git a/PostFundManagement.Api/Endpoints/Communications/GetInvitesEndpoint.cs b/PostFundManagement.Api/Endpoints/Communications/GetInvitesEndpoint.cs index 851e83d..e8ae41d 100644 --- a/PostFundManagement.Api/Endpoints/Communications/GetInvitesEndpoint.cs +++ b/PostFundManagement.Api/Endpoints/Communications/GetInvitesEndpoint.cs @@ -1,5 +1,5 @@ -using PostFundManagement.Application.Communications; using PostFundManagement.Application.Extensions; +using PostFundManagement.Application.Services.Communications; using PostFundManagement.Domain; using PostFundManagement.Domain.Abstractions; using PostFundManagement.Domain.Api; diff --git a/PostFundManagement.Api/Endpoints/Communications/SendInviteEndpoint.cs b/PostFundManagement.Api/Endpoints/Communications/SendInviteEndpoint.cs index 8eafec8..3b18a88 100644 --- a/PostFundManagement.Api/Endpoints/Communications/SendInviteEndpoint.cs +++ b/PostFundManagement.Api/Endpoints/Communications/SendInviteEndpoint.cs @@ -1,5 +1,5 @@ -using PostFundManagement.Application.Communications; using PostFundManagement.Application.Extensions; +using PostFundManagement.Application.Services.Communications; using PostFundManagement.Domain.Abstractions; using PostFundManagement.Domain.Api; using PostFundManagement.Domain.Extensions; diff --git a/PostFundManagement.Api/Endpoints/Communications/SyncIdentityUserEndpoint.cs b/PostFundManagement.Api/Endpoints/Communications/SyncIdentityUserEndpoint.cs index a5c4165..703a493 100644 --- a/PostFundManagement.Api/Endpoints/Communications/SyncIdentityUserEndpoint.cs +++ b/PostFundManagement.Api/Endpoints/Communications/SyncIdentityUserEndpoint.cs @@ -1,5 +1,5 @@ -using PostFundManagement.Application.Communications.Events; using PostFundManagement.Application.Extensions; +using PostFundManagement.Application.Services.Communications.Events; using PostFundManagement.Domain.Abstractions; using PostFundManagement.Domain.Api; using PostFundManagement.Domain.Extensions; diff --git a/PostFundManagement.Api/Endpoints/Evidence/CreateIndicatorEndpoint.cs b/PostFundManagement.Api/Endpoints/Evidence/CreateIndicatorEndpoint.cs index 8417dc3..1165275 100644 --- a/PostFundManagement.Api/Endpoints/Evidence/CreateIndicatorEndpoint.cs +++ b/PostFundManagement.Api/Endpoints/Evidence/CreateIndicatorEndpoint.cs @@ -1,5 +1,5 @@ -using PostFundManagement.Application.Evidence; using PostFundManagement.Application.Extensions; +using PostFundManagement.Application.Services.Evidence; using PostFundManagement.Domain.Abstractions; using PostFundManagement.Domain.Api; using PostFundManagement.Domain.Extensions; diff --git a/PostFundManagement.Api/Endpoints/Evidence/CreateMilestoneEndpoint.cs b/PostFundManagement.Api/Endpoints/Evidence/CreateMilestoneEndpoint.cs index 3756a1c..e62047d 100644 --- a/PostFundManagement.Api/Endpoints/Evidence/CreateMilestoneEndpoint.cs +++ b/PostFundManagement.Api/Endpoints/Evidence/CreateMilestoneEndpoint.cs @@ -1,5 +1,5 @@ -using PostFundManagement.Application.Evidence; using PostFundManagement.Application.Extensions; +using PostFundManagement.Application.Services.Evidence; using PostFundManagement.Domain.Abstractions; using PostFundManagement.Domain.Api; using PostFundManagement.Domain.Extensions; diff --git a/PostFundManagement.Api/Endpoints/Evidence/GetEvidenceFilesEndpoint.cs b/PostFundManagement.Api/Endpoints/Evidence/GetEvidenceFilesEndpoint.cs index e35de84..c35b980 100644 --- a/PostFundManagement.Api/Endpoints/Evidence/GetEvidenceFilesEndpoint.cs +++ b/PostFundManagement.Api/Endpoints/Evidence/GetEvidenceFilesEndpoint.cs @@ -1,5 +1,5 @@ -using PostFundManagement.Application.Evidence; using PostFundManagement.Application.Extensions; +using PostFundManagement.Application.Services.Evidence; using PostFundManagement.Domain; using PostFundManagement.Domain.Abstractions; using PostFundManagement.Domain.Api; diff --git a/PostFundManagement.Api/Endpoints/Evidence/GetIndicatorsEndpoint.cs b/PostFundManagement.Api/Endpoints/Evidence/GetIndicatorsEndpoint.cs index 139e23b..d97485e 100644 --- a/PostFundManagement.Api/Endpoints/Evidence/GetIndicatorsEndpoint.cs +++ b/PostFundManagement.Api/Endpoints/Evidence/GetIndicatorsEndpoint.cs @@ -1,5 +1,5 @@ -using PostFundManagement.Application.Evidence; using PostFundManagement.Application.Extensions; +using PostFundManagement.Application.Services.Evidence; using PostFundManagement.Domain; using PostFundManagement.Domain.Abstractions; using PostFundManagement.Domain.Api; diff --git a/PostFundManagement.Api/Endpoints/Evidence/GetMilestonesEndpoint.cs b/PostFundManagement.Api/Endpoints/Evidence/GetMilestonesEndpoint.cs index 3153ee1..6658f0a 100644 --- a/PostFundManagement.Api/Endpoints/Evidence/GetMilestonesEndpoint.cs +++ b/PostFundManagement.Api/Endpoints/Evidence/GetMilestonesEndpoint.cs @@ -1,5 +1,5 @@ -using PostFundManagement.Application.Evidence; using PostFundManagement.Application.Extensions; +using PostFundManagement.Application.Services.Evidence; using PostFundManagement.Domain; using PostFundManagement.Domain.Abstractions; using PostFundManagement.Domain.Api; diff --git a/PostFundManagement.Api/Endpoints/Evidence/GetProjectMilestonesEndpoint.cs b/PostFundManagement.Api/Endpoints/Evidence/GetProjectMilestonesEndpoint.cs index bc9791b..01fa6b1 100644 --- a/PostFundManagement.Api/Endpoints/Evidence/GetProjectMilestonesEndpoint.cs +++ b/PostFundManagement.Api/Endpoints/Evidence/GetProjectMilestonesEndpoint.cs @@ -1,9 +1,9 @@ -using PostFundManagement.Application.Evidence; using PostFundManagement.Domain.Abstractions; using PostFundManagement.Domain.Api; using PostFundManagement.Domain.Models; using PostFundManagement.Domain.Extensions; using PostFundManagement.Application.Extensions; +using PostFundManagement.Application.Services.Evidence; namespace PostFundManagement.Api.Endpoints.Evidence; diff --git a/PostFundManagement.Api/Endpoints/Evidence/RecordIndicatorAmountEndpoint.cs b/PostFundManagement.Api/Endpoints/Evidence/RecordIndicatorAmountEndpoint.cs index 69851fa..c06efa1 100644 --- a/PostFundManagement.Api/Endpoints/Evidence/RecordIndicatorAmountEndpoint.cs +++ b/PostFundManagement.Api/Endpoints/Evidence/RecordIndicatorAmountEndpoint.cs @@ -1,5 +1,5 @@ -using PostFundManagement.Application.Evidence; using PostFundManagement.Application.Extensions; +using PostFundManagement.Application.Services.Evidence; using PostFundManagement.Domain.Abstractions; using PostFundManagement.Domain.Api; using PostFundManagement.Domain.Extensions; diff --git a/PostFundManagement.Api/Endpoints/Evidence/UploadEvidenceFilesEndpoint.cs b/PostFundManagement.Api/Endpoints/Evidence/UploadEvidenceFilesEndpoint.cs index e4bf333..eaeb4ca 100644 --- a/PostFundManagement.Api/Endpoints/Evidence/UploadEvidenceFilesEndpoint.cs +++ b/PostFundManagement.Api/Endpoints/Evidence/UploadEvidenceFilesEndpoint.cs @@ -1,5 +1,5 @@ -using PostFundManagement.Application.Evidence; using PostFundManagement.Application.Extensions; +using PostFundManagement.Application.Services.Evidence; using PostFundManagement.Domain.Abstractions; using PostFundManagement.Domain.Api; using PostFundManagement.Domain.Extensions; diff --git a/PostFundManagement.Api/Endpoints/Execution/ApproveDisbursementEndpoint.cs b/PostFundManagement.Api/Endpoints/Execution/ApproveDisbursementEndpoint.cs index d00397a..29b6042 100644 --- a/PostFundManagement.Api/Endpoints/Execution/ApproveDisbursementEndpoint.cs +++ b/PostFundManagement.Api/Endpoints/Execution/ApproveDisbursementEndpoint.cs @@ -1,5 +1,5 @@ -using PostFundManagement.Application.Execution; using PostFundManagement.Application.Extensions; +using PostFundManagement.Application.Services.Execution; using PostFundManagement.Domain.Abstractions; using PostFundManagement.Domain.Api; using PostFundManagement.Domain.Extensions; diff --git a/PostFundManagement.Api/Endpoints/Execution/CreateDisbursementEndpoint.cs b/PostFundManagement.Api/Endpoints/Execution/CreateDisbursementEndpoint.cs index 45e75af..efc1389 100644 --- a/PostFundManagement.Api/Endpoints/Execution/CreateDisbursementEndpoint.cs +++ b/PostFundManagement.Api/Endpoints/Execution/CreateDisbursementEndpoint.cs @@ -1,5 +1,5 @@ -using PostFundManagement.Application.Execution; using PostFundManagement.Application.Extensions; +using PostFundManagement.Application.Services.Execution; using PostFundManagement.Domain.Abstractions; using PostFundManagement.Domain.Api; using PostFundManagement.Domain.Extensions; diff --git a/PostFundManagement.Api/Endpoints/Execution/CreateRiskEndpoint.cs b/PostFundManagement.Api/Endpoints/Execution/CreateRiskEndpoint.cs index db9a11b..277669f 100644 --- a/PostFundManagement.Api/Endpoints/Execution/CreateRiskEndpoint.cs +++ b/PostFundManagement.Api/Endpoints/Execution/CreateRiskEndpoint.cs @@ -1,5 +1,5 @@ -using PostFundManagement.Application.Execution; using PostFundManagement.Application.Extensions; +using PostFundManagement.Application.Services.Execution; using PostFundManagement.Domain.Abstractions; using PostFundManagement.Domain.Api; using PostFundManagement.Domain.Extensions; diff --git a/PostFundManagement.Api/Endpoints/Execution/GetDisbursementsEndpoint.cs b/PostFundManagement.Api/Endpoints/Execution/GetDisbursementsEndpoint.cs index aae69b5..837606e 100644 --- a/PostFundManagement.Api/Endpoints/Execution/GetDisbursementsEndpoint.cs +++ b/PostFundManagement.Api/Endpoints/Execution/GetDisbursementsEndpoint.cs @@ -1,10 +1,10 @@ -using PostFundManagement.Application.Execution; using PostFundManagement.Domain; using PostFundManagement.Domain.Abstractions; using PostFundManagement.Domain.Api; using PostFundManagement.Domain.Models; using PostFundManagement.Domain.Extensions; using PostFundManagement.Application.Extensions; +using PostFundManagement.Application.Services.Execution; namespace PostFundManagement.Api.Endpoints.Execution; diff --git a/PostFundManagement.Api/Endpoints/Execution/GetProjectRisksEndpoint.cs b/PostFundManagement.Api/Endpoints/Execution/GetProjectRisksEndpoint.cs index 429803d..019455a 100644 --- a/PostFundManagement.Api/Endpoints/Execution/GetProjectRisksEndpoint.cs +++ b/PostFundManagement.Api/Endpoints/Execution/GetProjectRisksEndpoint.cs @@ -1,9 +1,9 @@ -using PostFundManagement.Application.Execution; using PostFundManagement.Domain.Abstractions; using PostFundManagement.Domain.Api; using PostFundManagement.Domain.Models; using PostFundManagement.Domain.Extensions; using PostFundManagement.Application.Extensions; +using PostFundManagement.Application.Services.Execution; namespace PostFundManagement.Api.Endpoints.Execution; diff --git a/PostFundManagement.Api/Endpoints/Execution/GetRisksEndpoint.cs b/PostFundManagement.Api/Endpoints/Execution/GetRisksEndpoint.cs index 9f3fbe8..69e2746 100644 --- a/PostFundManagement.Api/Endpoints/Execution/GetRisksEndpoint.cs +++ b/PostFundManagement.Api/Endpoints/Execution/GetRisksEndpoint.cs @@ -1,5 +1,5 @@ -using PostFundManagement.Application.Execution; using PostFundManagement.Application.Extensions; +using PostFundManagement.Application.Services.Execution; using PostFundManagement.Domain; using PostFundManagement.Domain.Abstractions; using PostFundManagement.Domain.Api; diff --git a/PostFundManagement.Api/Endpoints/Governance/CreateOrganisationEndpoint.cs b/PostFundManagement.Api/Endpoints/Governance/CreateOrganisationEndpoint.cs index 7d91939..622f0dd 100644 --- a/PostFundManagement.Api/Endpoints/Governance/CreateOrganisationEndpoint.cs +++ b/PostFundManagement.Api/Endpoints/Governance/CreateOrganisationEndpoint.cs @@ -1,5 +1,5 @@ using PostFundManagement.Application.Extensions; -using PostFundManagement.Application.Governance; +using PostFundManagement.Application.Services.Governance; using PostFundManagement.Domain.Abstractions; using PostFundManagement.Domain.Api; using PostFundManagement.Domain.Extensions; diff --git a/PostFundManagement.Api/Endpoints/Governance/DashboardEndpoint.cs b/PostFundManagement.Api/Endpoints/Governance/DashboardEndpoint.cs index 0c534a0..941c165 100644 --- a/PostFundManagement.Api/Endpoints/Governance/DashboardEndpoint.cs +++ b/PostFundManagement.Api/Endpoints/Governance/DashboardEndpoint.cs @@ -1,5 +1,5 @@ using PostFundManagement.Application.Extensions; -using PostFundManagement.Application.Governance; +using PostFundManagement.Application.Services.Governance; using PostFundManagement.Domain.Abstractions; using PostFundManagement.Domain.Api; using PostFundManagement.Domain.Extensions; diff --git a/PostFundManagement.Api/Endpoints/Governance/GetInstrumentsEndpoint.cs b/PostFundManagement.Api/Endpoints/Governance/GetInstrumentsEndpoint.cs index 31d734e..27e9b8a 100644 --- a/PostFundManagement.Api/Endpoints/Governance/GetInstrumentsEndpoint.cs +++ b/PostFundManagement.Api/Endpoints/Governance/GetInstrumentsEndpoint.cs @@ -1,4 +1,5 @@ using PostFundManagement.Application.Extensions; +using PostFundManagement.Application.Services.Governance; using PostFundManagement.Domain.Abstractions; using PostFundManagement.Domain.Api; using PostFundManagement.Domain.Extensions; @@ -11,7 +12,7 @@ public class GetInstrumentsEndpoint : IEndpoint { public void Map(IEndpointRouteBuilder builder) { - builder.MapGet("api/governance/instruments", async (Application.Governance.GovernanceService service, + builder.MapGet("api/governance/instruments", async (GovernanceService service, CancellationToken cancellationToken = default) => { var result = await service.GetInstrumentsAsync(cancellationToken); diff --git a/PostFundManagement.Api/Endpoints/Governance/GetOrganisationByIdEndpoint.cs b/PostFundManagement.Api/Endpoints/Governance/GetOrganisationByIdEndpoint.cs index e50471f..a62c4ab 100644 --- a/PostFundManagement.Api/Endpoints/Governance/GetOrganisationByIdEndpoint.cs +++ b/PostFundManagement.Api/Endpoints/Governance/GetOrganisationByIdEndpoint.cs @@ -1,5 +1,5 @@ using PostFundManagement.Application.Extensions; -using PostFundManagement.Application.Governance; +using PostFundManagement.Application.Services.Governance; using PostFundManagement.Domain.Abstractions; using PostFundManagement.Domain.Api; using PostFundManagement.Domain.Extensions; diff --git a/PostFundManagement.Api/Endpoints/Governance/GetOrganisationsEndpoint.cs b/PostFundManagement.Api/Endpoints/Governance/GetOrganisationsEndpoint.cs index 92be83d..c449184 100644 --- a/PostFundManagement.Api/Endpoints/Governance/GetOrganisationsEndpoint.cs +++ b/PostFundManagement.Api/Endpoints/Governance/GetOrganisationsEndpoint.cs @@ -1,5 +1,5 @@ using PostFundManagement.Application.Extensions; -using PostFundManagement.Application.Governance; +using PostFundManagement.Application.Services.Governance; using PostFundManagement.Domain; using PostFundManagement.Domain.Abstractions; using PostFundManagement.Domain.Api; diff --git a/PostFundManagement.Api/Endpoints/Governance/GetPortfoliosEndpoint.cs b/PostFundManagement.Api/Endpoints/Governance/GetPortfoliosEndpoint.cs index a75999e..57e9c58 100644 --- a/PostFundManagement.Api/Endpoints/Governance/GetPortfoliosEndpoint.cs +++ b/PostFundManagement.Api/Endpoints/Governance/GetPortfoliosEndpoint.cs @@ -1,5 +1,5 @@ using PostFundManagement.Application.Extensions; -using PostFundManagement.Application.Governance; +using PostFundManagement.Application.Services.Governance; using PostFundManagement.Domain.Abstractions; using PostFundManagement.Domain.Api; using PostFundManagement.Domain.Extensions; diff --git a/PostFundManagement.Api/Endpoints/Governance/GetProgrammesEndpoint.cs b/PostFundManagement.Api/Endpoints/Governance/GetProgrammesEndpoint.cs index dcc529e..769bbc1 100644 --- a/PostFundManagement.Api/Endpoints/Governance/GetProgrammesEndpoint.cs +++ b/PostFundManagement.Api/Endpoints/Governance/GetProgrammesEndpoint.cs @@ -1,5 +1,5 @@ using PostFundManagement.Application.Extensions; -using PostFundManagement.Application.Governance; +using PostFundManagement.Application.Services.Governance; using PostFundManagement.Domain.Abstractions; using PostFundManagement.Domain.Api; using PostFundManagement.Domain.Extensions; diff --git a/PostFundManagement.Api/Endpoints/Grants/CreateAwardEndpoint.cs b/PostFundManagement.Api/Endpoints/Grants/CreateAwardEndpoint.cs index 190787f..8546e7c 100644 --- a/PostFundManagement.Api/Endpoints/Grants/CreateAwardEndpoint.cs +++ b/PostFundManagement.Api/Endpoints/Grants/CreateAwardEndpoint.cs @@ -1,5 +1,5 @@ using PostFundManagement.Application.Extensions; -using PostFundManagement.Application.Grants; +using PostFundManagement.Application.Services.Grants; using PostFundManagement.Domain.Abstractions; using PostFundManagement.Domain.Api; using PostFundManagement.Domain.Extensions; diff --git a/PostFundManagement.Api/Endpoints/Grants/CreateBudgetEndpoint.cs b/PostFundManagement.Api/Endpoints/Grants/CreateBudgetEndpoint.cs index d570f87..cef4d82 100644 --- a/PostFundManagement.Api/Endpoints/Grants/CreateBudgetEndpoint.cs +++ b/PostFundManagement.Api/Endpoints/Grants/CreateBudgetEndpoint.cs @@ -1,5 +1,5 @@ using PostFundManagement.Application.Extensions; -using PostFundManagement.Application.Grants; +using PostFundManagement.Application.Services.Grants; using PostFundManagement.Domain.Abstractions; using PostFundManagement.Domain.Api; using PostFundManagement.Domain.Extensions; diff --git a/PostFundManagement.Api/Endpoints/Grants/CreateContractEndpoint.cs b/PostFundManagement.Api/Endpoints/Grants/CreateContractEndpoint.cs index 2d03d2a..68778af 100644 --- a/PostFundManagement.Api/Endpoints/Grants/CreateContractEndpoint.cs +++ b/PostFundManagement.Api/Endpoints/Grants/CreateContractEndpoint.cs @@ -1,5 +1,5 @@ using PostFundManagement.Application.Extensions; -using PostFundManagement.Application.Grants; +using PostFundManagement.Application.Services.Grants; using PostFundManagement.Domain.Abstractions; using PostFundManagement.Domain.Api; using PostFundManagement.Domain.Extensions; diff --git a/PostFundManagement.Api/Endpoints/Grants/ExecuteContractEndpoint.cs b/PostFundManagement.Api/Endpoints/Grants/ExecuteContractEndpoint.cs index 608d45f..baf3452 100644 --- a/PostFundManagement.Api/Endpoints/Grants/ExecuteContractEndpoint.cs +++ b/PostFundManagement.Api/Endpoints/Grants/ExecuteContractEndpoint.cs @@ -1,5 +1,5 @@ using PostFundManagement.Application.Extensions; -using PostFundManagement.Application.Grants; +using PostFundManagement.Application.Services.Grants; using PostFundManagement.Domain.Abstractions; using PostFundManagement.Domain.Api; using PostFundManagement.Domain.Extensions; diff --git a/PostFundManagement.Api/Endpoints/Grants/GetAwardByIdEndpoint.cs b/PostFundManagement.Api/Endpoints/Grants/GetAwardByIdEndpoint.cs index 63980fa..0735947 100644 --- a/PostFundManagement.Api/Endpoints/Grants/GetAwardByIdEndpoint.cs +++ b/PostFundManagement.Api/Endpoints/Grants/GetAwardByIdEndpoint.cs @@ -1,5 +1,5 @@ using PostFundManagement.Application.Extensions; -using PostFundManagement.Application.Grants; +using PostFundManagement.Application.Services.Grants; using PostFundManagement.Domain.Abstractions; using PostFundManagement.Domain.Api; using PostFundManagement.Domain.Extensions; diff --git a/PostFundManagement.Api/Endpoints/Grants/GetAwardsEndpoint.cs b/PostFundManagement.Api/Endpoints/Grants/GetAwardsEndpoint.cs index b8aec40..8910dad 100644 --- a/PostFundManagement.Api/Endpoints/Grants/GetAwardsEndpoint.cs +++ b/PostFundManagement.Api/Endpoints/Grants/GetAwardsEndpoint.cs @@ -1,10 +1,10 @@ -using PostFundManagement.Application.Grants; using PostFundManagement.Domain; using PostFundManagement.Domain.Abstractions; using PostFundManagement.Domain.Api; using PostFundManagement.Domain.Models; using PostFundManagement.Domain.Extensions; using PostFundManagement.Application.Extensions; +using PostFundManagement.Application.Services.Grants; namespace PostFundManagement.Api.Endpoints.Grants; diff --git a/PostFundManagement.Api/Endpoints/Grants/GetBudgetByIdEndpoint.cs b/PostFundManagement.Api/Endpoints/Grants/GetBudgetByIdEndpoint.cs index 4600895..d7ae8f9 100644 --- a/PostFundManagement.Api/Endpoints/Grants/GetBudgetByIdEndpoint.cs +++ b/PostFundManagement.Api/Endpoints/Grants/GetBudgetByIdEndpoint.cs @@ -1,5 +1,5 @@ using PostFundManagement.Application.Extensions; -using PostFundManagement.Application.Grants; +using PostFundManagement.Application.Services.Grants; using PostFundManagement.Domain.Abstractions; using PostFundManagement.Domain.Api; using PostFundManagement.Domain.Extensions; diff --git a/PostFundManagement.Api/Endpoints/Grants/GetBudgetsEndpoint.cs b/PostFundManagement.Api/Endpoints/Grants/GetBudgetsEndpoint.cs index 7ff011b..11b2723 100644 --- a/PostFundManagement.Api/Endpoints/Grants/GetBudgetsEndpoint.cs +++ b/PostFundManagement.Api/Endpoints/Grants/GetBudgetsEndpoint.cs @@ -1,10 +1,10 @@ -using PostFundManagement.Application.Grants; using PostFundManagement.Domain; using PostFundManagement.Domain.Abstractions; using PostFundManagement.Domain.Api; using PostFundManagement.Domain.Models; using PostFundManagement.Domain.Extensions; using PostFundManagement.Application.Extensions; +using PostFundManagement.Application.Services.Grants; namespace PostFundManagement.Api.Endpoints.Grants; diff --git a/PostFundManagement.Api/Endpoints/Grants/GetContractByIdEndpoint.cs b/PostFundManagement.Api/Endpoints/Grants/GetContractByIdEndpoint.cs index abd1deb..4f7aed8 100644 --- a/PostFundManagement.Api/Endpoints/Grants/GetContractByIdEndpoint.cs +++ b/PostFundManagement.Api/Endpoints/Grants/GetContractByIdEndpoint.cs @@ -1,5 +1,5 @@ using PostFundManagement.Application.Extensions; -using PostFundManagement.Application.Grants; +using PostFundManagement.Application.Services.Grants; using PostFundManagement.Domain.Abstractions; using PostFundManagement.Domain.Api; using PostFundManagement.Domain.Extensions; diff --git a/PostFundManagement.Api/Endpoints/Grants/GetContractsEndpoint.cs b/PostFundManagement.Api/Endpoints/Grants/GetContractsEndpoint.cs index a355df8..a31a768 100644 --- a/PostFundManagement.Api/Endpoints/Grants/GetContractsEndpoint.cs +++ b/PostFundManagement.Api/Endpoints/Grants/GetContractsEndpoint.cs @@ -1,5 +1,5 @@ using PostFundManagement.Application.Extensions; -using PostFundManagement.Application.Grants; +using PostFundManagement.Application.Services.Grants; using PostFundManagement.Domain; using PostFundManagement.Domain.Abstractions; using PostFundManagement.Domain.Api; diff --git a/PostFundManagement.Api/Endpoints/Projects/CreateActivityEndpoint.cs b/PostFundManagement.Api/Endpoints/Projects/CreateActivityEndpoint.cs index be2db04..9c71643 100644 --- a/PostFundManagement.Api/Endpoints/Projects/CreateActivityEndpoint.cs +++ b/PostFundManagement.Api/Endpoints/Projects/CreateActivityEndpoint.cs @@ -1,5 +1,5 @@ using PostFundManagement.Application.Extensions; -using PostFundManagement.Application.Projects; +using PostFundManagement.Application.Services.Projects; using PostFundManagement.Domain.Abstractions; using PostFundManagement.Domain.Api; using PostFundManagement.Domain.Extensions; diff --git a/PostFundManagement.Api/Endpoints/Projects/CreateProjectEndpoint.cs b/PostFundManagement.Api/Endpoints/Projects/CreateProjectEndpoint.cs index 2b5d9d0..2e7ea7a 100644 --- a/PostFundManagement.Api/Endpoints/Projects/CreateProjectEndpoint.cs +++ b/PostFundManagement.Api/Endpoints/Projects/CreateProjectEndpoint.cs @@ -1,5 +1,5 @@ using PostFundManagement.Application.Extensions; -using PostFundManagement.Application.Projects; +using PostFundManagement.Application.Services.Projects; using PostFundManagement.Domain.Abstractions; using PostFundManagement.Domain.Api; using PostFundManagement.Domain.Extensions; diff --git a/PostFundManagement.Api/Endpoints/Projects/GetActivitiesEndpoint.cs b/PostFundManagement.Api/Endpoints/Projects/GetActivitiesEndpoint.cs index 773f3f7..781f266 100644 --- a/PostFundManagement.Api/Endpoints/Projects/GetActivitiesEndpoint.cs +++ b/PostFundManagement.Api/Endpoints/Projects/GetActivitiesEndpoint.cs @@ -1,5 +1,5 @@ using PostFundManagement.Application.Extensions; -using PostFundManagement.Application.Projects; +using PostFundManagement.Application.Services.Projects; using PostFundManagement.Domain.Abstractions; using PostFundManagement.Domain.Api; using PostFundManagement.Domain.Extensions; diff --git a/PostFundManagement.Api/Endpoints/Projects/GetProjectByIdEndpoint.cs b/PostFundManagement.Api/Endpoints/Projects/GetProjectByIdEndpoint.cs index 58b335a..234ec13 100644 --- a/PostFundManagement.Api/Endpoints/Projects/GetProjectByIdEndpoint.cs +++ b/PostFundManagement.Api/Endpoints/Projects/GetProjectByIdEndpoint.cs @@ -1,5 +1,5 @@ using PostFundManagement.Application.Extensions; -using PostFundManagement.Application.Projects; +using PostFundManagement.Application.Services.Projects; using PostFundManagement.Domain.Abstractions; using PostFundManagement.Domain.Api; using PostFundManagement.Domain.Extensions; diff --git a/PostFundManagement.Api/Endpoints/Projects/GetProjectsEndpoint.cs b/PostFundManagement.Api/Endpoints/Projects/GetProjectsEndpoint.cs index a55e7c6..8dc79ad 100644 --- a/PostFundManagement.Api/Endpoints/Projects/GetProjectsEndpoint.cs +++ b/PostFundManagement.Api/Endpoints/Projects/GetProjectsEndpoint.cs @@ -1,5 +1,5 @@ using PostFundManagement.Application.Extensions; -using PostFundManagement.Application.Projects; +using PostFundManagement.Application.Services.Projects; using PostFundManagement.Domain; using PostFundManagement.Domain.Abstractions; using PostFundManagement.Domain.Api; diff --git a/PostFundManagement.Api/Endpoints/Projects/UpdateProjectEndpoint.cs b/PostFundManagement.Api/Endpoints/Projects/UpdateProjectEndpoint.cs index 15a7509..a0185fb 100644 --- a/PostFundManagement.Api/Endpoints/Projects/UpdateProjectEndpoint.cs +++ b/PostFundManagement.Api/Endpoints/Projects/UpdateProjectEndpoint.cs @@ -1,5 +1,5 @@ using PostFundManagement.Application.Extensions; -using PostFundManagement.Application.Projects; +using PostFundManagement.Application.Services.Projects; using PostFundManagement.Domain.Abstractions; using PostFundManagement.Domain.Api; using PostFundManagement.Domain.Extensions; diff --git a/PostFundManagement.Api/Endpoints/Users/GetUsersEndpoint.cs b/PostFundManagement.Api/Endpoints/Users/GetUsersEndpoint.cs index 28ab9c2..66e9064 100644 --- a/PostFundManagement.Api/Endpoints/Users/GetUsersEndpoint.cs +++ b/PostFundManagement.Api/Endpoints/Users/GetUsersEndpoint.cs @@ -1,5 +1,5 @@ using PostFundManagement.Application.Extensions; -using PostFundManagement.Application.Users; +using PostFundManagement.Application.Services.Users; using PostFundManagement.Domain; using PostFundManagement.Domain.Abstractions; using PostFundManagement.Domain.Api; diff --git a/PostFundManagement.Api/Endpoints/Users/SyncUserEndpoint.cs b/PostFundManagement.Api/Endpoints/Users/SyncUserEndpoint.cs index 1845dbd..63b42b2 100644 --- a/PostFundManagement.Api/Endpoints/Users/SyncUserEndpoint.cs +++ b/PostFundManagement.Api/Endpoints/Users/SyncUserEndpoint.cs @@ -1,5 +1,5 @@ using PostFundManagement.Application.Extensions; -using PostFundManagement.Application.Users; +using PostFundManagement.Application.Services.Users; using PostFundManagement.Domain.Abstractions; using PostFundManagement.Domain.Api; using PostFundManagement.Domain.Extensions; diff --git a/PostFundManagement.Application/Api/Filters/ActiveUserFilter.cs b/PostFundManagement.Application/Api/Filters/ActiveUserFilter.cs index 060a208..b8680b8 100644 --- a/PostFundManagement.Application/Api/Filters/ActiveUserFilter.cs +++ b/PostFundManagement.Application/Api/Filters/ActiveUserFilter.cs @@ -1,4 +1,4 @@ -using PostFundManagement.Application.Shared; +using PostFundManagement.Application.Services.Shared; using static PostFundManagement.Application.Extensions.General; using static PostFundManagement.Domain.Extensions.Constants; diff --git a/PostFundManagement.Application/Extensions/Email.cs b/PostFundManagement.Application/Extensions/Email.cs index d9a9bc7..0a0eee5 100644 --- a/PostFundManagement.Application/Extensions/Email.cs +++ b/PostFundManagement.Application/Extensions/Email.cs @@ -1,4 +1,4 @@ -using PostFundManagement.Application.Shared; +using PostFundManagement.Application.Services.Shared; using PostFundManagement.Domain.Configuration.Email; namespace PostFundManagement.Application.Extensions; diff --git a/PostFundManagement.Application/Extensions/S3.cs b/PostFundManagement.Application/Extensions/S3.cs index 3493283..6d45848 100644 --- a/PostFundManagement.Application/Extensions/S3.cs +++ b/PostFundManagement.Application/Extensions/S3.cs @@ -1,4 +1,4 @@ -using PostFundManagement.Application.Shared; +using PostFundManagement.Application.Services.Shared; using PostFundManagement.Domain.Abstractions; using static PostFundManagement.Domain.Extensions.Constants; diff --git a/PostFundManagement.Application/Extensions/Security.cs b/PostFundManagement.Application/Extensions/Security.cs index 736aa40..e76361d 100644 --- a/PostFundManagement.Application/Extensions/Security.cs +++ b/PostFundManagement.Application/Extensions/Security.cs @@ -1,4 +1,4 @@ -using PostFundManagement.Application.Shared; +using PostFundManagement.Application.Services.Shared; using PostFundManagement.Domain.Api.Configuration; using PostFundManagement.Domain.Sdk; using PostFundManagement.Infrastructure.Database; diff --git a/PostFundManagement.Application/Communications/CommunicationsService.cs b/PostFundManagement.Application/Services/Communications/CommunicationsService.cs similarity index 97% rename from PostFundManagement.Application/Communications/CommunicationsService.cs rename to PostFundManagement.Application/Services/Communications/CommunicationsService.cs index 41f8f41..960292b 100644 --- a/PostFundManagement.Application/Communications/CommunicationsService.cs +++ b/PostFundManagement.Application/Services/Communications/CommunicationsService.cs @@ -4,7 +4,7 @@ using PostFundManagement.Domain.Extensions; using PostFundManagement.Domain.Models; using PostFundManagement.Infrastructure.Database; -namespace PostFundManagement.Application.Communications; +namespace PostFundManagement.Application.Services.Communications; public sealed class CommunicationsService(IDbContextFactory contextFactory) : IService { diff --git a/PostFundManagement.Application/Communications/Events/SyncUserEvent.cs b/PostFundManagement.Application/Services/Communications/Events/SyncUserEvent.cs similarity index 88% rename from PostFundManagement.Application/Communications/Events/SyncUserEvent.cs rename to PostFundManagement.Application/Services/Communications/Events/SyncUserEvent.cs index b5e83c4..86e93a4 100644 --- a/PostFundManagement.Application/Communications/Events/SyncUserEvent.cs +++ b/PostFundManagement.Application/Services/Communications/Events/SyncUserEvent.cs @@ -1,7 +1,7 @@ using PostFundManagement.Application.Abstractions; using PostFundManagement.Domain.Abstractions; -namespace PostFundManagement.Application.Communications.Events; +namespace PostFundManagement.Application.Services.Communications.Events; public class SyncUserEvent : EventBase, IEvent { diff --git a/PostFundManagement.Application/Communications/Records.cs b/PostFundManagement.Application/Services/Communications/Records.cs similarity index 76% rename from PostFundManagement.Application/Communications/Records.cs rename to PostFundManagement.Application/Services/Communications/Records.cs index 5d92003..1283660 100644 --- a/PostFundManagement.Application/Communications/Records.cs +++ b/PostFundManagement.Application/Services/Communications/Records.cs @@ -1,5 +1,5 @@ using PostFundManagement.Domain; -namespace PostFundManagement.Application.Communications; +namespace PostFundManagement.Application.Services.Communications; public record InviteRequest(long OrganisationId, long InvitedOrganisationId, long AwardId, long ContractId, Guid Recipient, string Message, NotificationPlatform Platform); diff --git a/PostFundManagement.Application/Evidence/EvidenceService.cs b/PostFundManagement.Application/Services/Evidence/EvidenceService.cs similarity index 99% rename from PostFundManagement.Application/Evidence/EvidenceService.cs rename to PostFundManagement.Application/Services/Evidence/EvidenceService.cs index bbb12a6..f764a6c 100644 --- a/PostFundManagement.Application/Evidence/EvidenceService.cs +++ b/PostFundManagement.Application/Services/Evidence/EvidenceService.cs @@ -5,7 +5,7 @@ using PostFundManagement.Domain.Extensions; using PostFundManagement.Domain.Models; using PostFundManagement.Infrastructure.Database; -namespace PostFundManagement.Application.Evidence; +namespace PostFundManagement.Application.Services.Evidence; public sealed class EvidenceService(IDbContextFactory contextFactory, HashService hashService, [FromKeyedServices(Constants.EvidenceBucketName)] IS3Service s3Service) : IService diff --git a/PostFundManagement.Application/Evidence/Records.cs b/PostFundManagement.Application/Services/Evidence/Records.cs similarity index 85% rename from PostFundManagement.Application/Evidence/Records.cs rename to PostFundManagement.Application/Services/Evidence/Records.cs index 3b12b61..6cd3ded 100644 --- a/PostFundManagement.Application/Evidence/Records.cs +++ b/PostFundManagement.Application/Services/Evidence/Records.cs @@ -1,6 +1,6 @@ using PostFundManagement.Domain; -namespace PostFundManagement.Application.Evidence; +namespace PostFundManagement.Application.Services.Evidence; public record RecordActualRequest(decimal ActualAmount); diff --git a/PostFundManagement.Application/Execution/ExecutionService.cs b/PostFundManagement.Application/Services/Execution/ExecutionService.cs similarity index 99% rename from PostFundManagement.Application/Execution/ExecutionService.cs rename to PostFundManagement.Application/Services/Execution/ExecutionService.cs index 96a144f..38c55f7 100644 --- a/PostFundManagement.Application/Execution/ExecutionService.cs +++ b/PostFundManagement.Application/Services/Execution/ExecutionService.cs @@ -5,7 +5,7 @@ using PostFundManagement.Domain.Extensions; using PostFundManagement.Domain.Models; using PostFundManagement.Infrastructure.Database; -namespace PostFundManagement.Application.Execution; +namespace PostFundManagement.Application.Services.Execution; public sealed class ExecutionService(IDbContextFactory contextFactory, HashService hashService) : IService { diff --git a/PostFundManagement.Application/Execution/Records.cs b/PostFundManagement.Application/Services/Execution/Records.cs similarity index 80% rename from PostFundManagement.Application/Execution/Records.cs rename to PostFundManagement.Application/Services/Execution/Records.cs index 01f3d68..0538b4c 100644 --- a/PostFundManagement.Application/Execution/Records.cs +++ b/PostFundManagement.Application/Services/Execution/Records.cs @@ -1,6 +1,6 @@ using PostFundManagement.Domain; -namespace PostFundManagement.Application.Execution; +namespace PostFundManagement.Application.Services.Execution; public record CreateDisbursementRequest(long ProjectId, long? MilestoneId, decimal Amount); diff --git a/PostFundManagement.Application/Governance/GovernanceService.cs b/PostFundManagement.Application/Services/Governance/GovernanceService.cs similarity index 99% rename from PostFundManagement.Application/Governance/GovernanceService.cs rename to PostFundManagement.Application/Services/Governance/GovernanceService.cs index c16cbf8..b1c9008 100644 --- a/PostFundManagement.Application/Governance/GovernanceService.cs +++ b/PostFundManagement.Application/Services/Governance/GovernanceService.cs @@ -5,7 +5,7 @@ using PostFundManagement.Domain.Extensions; using PostFundManagement.Domain.Models; using PostFundManagement.Infrastructure.Database; -namespace PostFundManagement.Application.Governance; +namespace PostFundManagement.Application.Services.Governance; public sealed class GovernanceService(IDbContextFactory contextFactory, HashService hashService) : IService { diff --git a/PostFundManagement.Application/Governance/Records.cs b/PostFundManagement.Application/Services/Governance/Records.cs similarity index 83% rename from PostFundManagement.Application/Governance/Records.cs rename to PostFundManagement.Application/Services/Governance/Records.cs index 7155fd7..c64aabe 100644 --- a/PostFundManagement.Application/Governance/Records.cs +++ b/PostFundManagement.Application/Services/Governance/Records.cs @@ -1,6 +1,6 @@ using PostFundManagement.Domain; -namespace PostFundManagement.Application.Governance; +namespace PostFundManagement.Application.Services.Governance; public record CreateOrganisationRequest(string Name, string RegistrationNo, string Email, OrganisationType Type); diff --git a/PostFundManagement.Application/Grants/GrantsService.cs b/PostFundManagement.Application/Services/Grants/GrantsService.cs similarity index 99% rename from PostFundManagement.Application/Grants/GrantsService.cs rename to PostFundManagement.Application/Services/Grants/GrantsService.cs index abd7fb2..09d0167 100644 --- a/PostFundManagement.Application/Grants/GrantsService.cs +++ b/PostFundManagement.Application/Services/Grants/GrantsService.cs @@ -5,7 +5,7 @@ using PostFundManagement.Domain.Extensions; using PostFundManagement.Domain.Models; using PostFundManagement.Infrastructure.Database; -namespace PostFundManagement.Application.Grants; +namespace PostFundManagement.Application.Services.Grants; public sealed class GrantsService(IDbContextFactory contextFactory, HashService hashService) : IService { diff --git a/PostFundManagement.Application/Grants/Records.cs b/PostFundManagement.Application/Services/Grants/Records.cs similarity index 86% rename from PostFundManagement.Application/Grants/Records.cs rename to PostFundManagement.Application/Services/Grants/Records.cs index eb01597..2c4b266 100644 --- a/PostFundManagement.Application/Grants/Records.cs +++ b/PostFundManagement.Application/Services/Grants/Records.cs @@ -1,4 +1,4 @@ -namespace PostFundManagement.Application.Grants; +namespace PostFundManagement.Application.Services.Grants; public record CreateAwardRequest(long OrganisationId, long ProgrammeId, decimal Amount); diff --git a/PostFundManagement.Application/Projects/ProjectService.cs b/PostFundManagement.Application/Services/Projects/ProjectService.cs similarity index 99% rename from PostFundManagement.Application/Projects/ProjectService.cs rename to PostFundManagement.Application/Services/Projects/ProjectService.cs index 428aa48..1e5ccac 100644 --- a/PostFundManagement.Application/Projects/ProjectService.cs +++ b/PostFundManagement.Application/Services/Projects/ProjectService.cs @@ -5,7 +5,7 @@ using PostFundManagement.Domain.Extensions; using PostFundManagement.Domain.Models; using PostFundManagement.Infrastructure.Database; -namespace PostFundManagement.Application.Projects; +namespace PostFundManagement.Application.Services.Projects; public sealed class ProjectService(IDbContextFactory contextFactory, HashService hashService) : IService { diff --git a/PostFundManagement.Application/Projects/Records.cs b/PostFundManagement.Application/Services/Projects/Records.cs similarity index 87% rename from PostFundManagement.Application/Projects/Records.cs rename to PostFundManagement.Application/Services/Projects/Records.cs index 6867a6d..0f3f897 100644 --- a/PostFundManagement.Application/Projects/Records.cs +++ b/PostFundManagement.Application/Services/Projects/Records.cs @@ -1,6 +1,6 @@ using PostFundManagement.Domain; -namespace PostFundManagement.Application.Projects; +namespace PostFundManagement.Application.Services.Projects; public record UpdateProjectStatusRequest(long ProjectId, ApprovalStatus Status); diff --git a/PostFundManagement.Application/Shared/BrowserLocalStorageService.cs b/PostFundManagement.Application/Services/Shared/BrowserLocalStorageService.cs similarity index 97% rename from PostFundManagement.Application/Shared/BrowserLocalStorageService.cs rename to PostFundManagement.Application/Services/Shared/BrowserLocalStorageService.cs index 9004705..9aa7715 100644 --- a/PostFundManagement.Application/Shared/BrowserLocalStorageService.cs +++ b/PostFundManagement.Application/Services/Shared/BrowserLocalStorageService.cs @@ -1,4 +1,4 @@ -namespace PostFundManagement.Application.Shared; +namespace PostFundManagement.Application.Services.Shared; public sealed class BrowserLocalStorageService(ProtectedLocalStorage storage) { diff --git a/PostFundManagement.Application/Shared/ContractS3Service.cs b/PostFundManagement.Application/Services/Shared/ContractS3Service.cs similarity index 90% rename from PostFundManagement.Application/Shared/ContractS3Service.cs rename to PostFundManagement.Application/Services/Shared/ContractS3Service.cs index 115ca72..3eac12c 100644 --- a/PostFundManagement.Application/Shared/ContractS3Service.cs +++ b/PostFundManagement.Application/Services/Shared/ContractS3Service.cs @@ -2,7 +2,7 @@ using PostFundManagement.Application.Abstractions; using PostFundManagement.Domain.Abstractions; using static PostFundManagement.Domain.Extensions.Constants; -namespace PostFundManagement.Application.Shared; +namespace PostFundManagement.Application.Services.Shared; public sealed class ContractS3Service(IConfiguration configuration, [FromKeyedServices(ContractBucketName)] IAmazonS3 amazonS3) : S3ServiceBase(amazonS3), IS3Service diff --git a/PostFundManagement.Application/Shared/EmailService.cs b/PostFundManagement.Application/Services/Shared/EmailService.cs similarity index 99% rename from PostFundManagement.Application/Shared/EmailService.cs rename to PostFundManagement.Application/Services/Shared/EmailService.cs index 64106fc..4d00835 100644 --- a/PostFundManagement.Application/Shared/EmailService.cs +++ b/PostFundManagement.Application/Services/Shared/EmailService.cs @@ -3,7 +3,7 @@ using PostFundManagement.Domain.Configuration.Email; using PostFundManagement.Domain.Extensions; using PostFundManagement.Domain.Models.Email; -namespace PostFundManagement.Application.Shared; +namespace PostFundManagement.Application.Services.Shared; public sealed class EmailService(IOptions options) : IDisposable { diff --git a/PostFundManagement.Application/Shared/EvidenceS3Service.cs b/PostFundManagement.Application/Services/Shared/EvidenceS3Service.cs similarity index 90% rename from PostFundManagement.Application/Shared/EvidenceS3Service.cs rename to PostFundManagement.Application/Services/Shared/EvidenceS3Service.cs index 1ef8a79..aac46f7 100644 --- a/PostFundManagement.Application/Shared/EvidenceS3Service.cs +++ b/PostFundManagement.Application/Services/Shared/EvidenceS3Service.cs @@ -2,7 +2,7 @@ using PostFundManagement.Application.Abstractions; using PostFundManagement.Domain.Abstractions; using static PostFundManagement.Domain.Extensions.Constants; -namespace PostFundManagement.Application.Shared; +namespace PostFundManagement.Application.Services.Shared; public sealed class EvidenceS3Service(IConfiguration configuration, [FromKeyedServices(EvidenceBucketName)] IAmazonS3 amazonS3) : S3ServiceBase(amazonS3), IS3Service diff --git a/PostFundManagement.Application/Shared/GeneralS3Service.cs b/PostFundManagement.Application/Services/Shared/GeneralS3Service.cs similarity index 90% rename from PostFundManagement.Application/Shared/GeneralS3Service.cs rename to PostFundManagement.Application/Services/Shared/GeneralS3Service.cs index d76502a..aa5bd7b 100644 --- a/PostFundManagement.Application/Shared/GeneralS3Service.cs +++ b/PostFundManagement.Application/Services/Shared/GeneralS3Service.cs @@ -2,7 +2,7 @@ using PostFundManagement.Application.Abstractions; using PostFundManagement.Domain.Abstractions; using static PostFundManagement.Domain.Extensions.Constants; -namespace PostFundManagement.Application.Shared; +namespace PostFundManagement.Application.Services.Shared; public sealed class GeneralS3Service(IConfiguration configuration, [FromKeyedServices(GeneralBucketName)] IAmazonS3 amazonS3) : S3ServiceBase(amazonS3), IS3Service diff --git a/PostFundManagement.Application/Shared/HashService.cs b/PostFundManagement.Application/Services/Shared/HashService.cs similarity index 100% rename from PostFundManagement.Application/Shared/HashService.cs rename to PostFundManagement.Application/Services/Shared/HashService.cs diff --git a/PostFundManagement.Application/Shared/IdentityService.cs b/PostFundManagement.Application/Services/Shared/IdentityService.cs similarity index 93% rename from PostFundManagement.Application/Shared/IdentityService.cs rename to PostFundManagement.Application/Services/Shared/IdentityService.cs index 814db04..356cb5d 100644 --- a/PostFundManagement.Application/Shared/IdentityService.cs +++ b/PostFundManagement.Application/Services/Shared/IdentityService.cs @@ -2,7 +2,7 @@ using PostFundManagement.Domain.Abstractions; using PostFundManagement.Infrastructure.Database; -namespace PostFundManagement.Application.Shared; +namespace PostFundManagement.Application.Services.Shared; public sealed class IdentityService(IDbContextFactory contextFactory) : IService { diff --git a/PostFundManagement.Application/Shared/TokenService.cs b/PostFundManagement.Application/Services/Shared/TokenService.cs similarity index 97% rename from PostFundManagement.Application/Shared/TokenService.cs rename to PostFundManagement.Application/Services/Shared/TokenService.cs index 822e113..aeb627a 100644 --- a/PostFundManagement.Application/Shared/TokenService.cs +++ b/PostFundManagement.Application/Services/Shared/TokenService.cs @@ -3,7 +3,7 @@ using PostFundManagement.Domain.Api.Configuration; using PostFundManagement.Domain.Api.Models; using PostFundManagement.Domain.Sdk; -namespace PostFundManagement.Application.Shared; +namespace PostFundManagement.Application.Services.Shared; public sealed class TokenService(ISecurityConnectApi connectApi, IOptions clientOptions) { diff --git a/PostFundManagement.Application/Users/Records.cs b/PostFundManagement.Application/Services/Users/Records.cs similarity index 75% rename from PostFundManagement.Application/Users/Records.cs rename to PostFundManagement.Application/Services/Users/Records.cs index c474968..b8ba6a8 100644 --- a/PostFundManagement.Application/Users/Records.cs +++ b/PostFundManagement.Application/Services/Users/Records.cs @@ -1,5 +1,5 @@ using PostFundManagement.Domain; -namespace PostFundManagement.Application.Users; +namespace PostFundManagement.Application.Services.Users; public record UserFilterRequest(ActivityStatus? Status = null, string? Email = null, string? SortBy = null, bool SortDescending = false); diff --git a/PostFundManagement.Application/Users/UserService.cs b/PostFundManagement.Application/Services/Users/UserService.cs similarity index 98% rename from PostFundManagement.Application/Users/UserService.cs rename to PostFundManagement.Application/Services/Users/UserService.cs index 7d6e1fc..8f3a65e 100644 --- a/PostFundManagement.Application/Users/UserService.cs +++ b/PostFundManagement.Application/Services/Users/UserService.cs @@ -4,7 +4,7 @@ using PostFundManagement.Domain.Extensions; using PostFundManagement.Domain.Models; using PostFundManagement.Infrastructure.Database; -namespace PostFundManagement.Application.Users; +namespace PostFundManagement.Application.Services.Users; public sealed class UserService(IDbContextFactory contextFactory) : IService { -- 2.47.3