PostFundManagement.Api/Endpoints/Communications/GetInvitesEndpoint.cs

@@ -1,11 +1,11 @@
-using PostFundManagement.Application.Communications;
 using PostFundManagement.Application.Extensions;
+using PostFundManagement.Application.Services.Communications;
 using PostFundManagement.Domain;
 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;
 

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;

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;

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;

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;

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;

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;

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;

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;
 

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;

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;

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;

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;

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;

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;
 

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;
 

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;

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;

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;

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);

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;
 

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;

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;
 

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

PostFundManagement.Application/Api/Filters/ActiveUserFilter.cs

@@ -1,5 +1,5 @@
-using PostFundManagement.Application.Shared;
+using PostFundManagement.Application.Services.Shared;
-using static PostFundManagement.Domain.Extensions.General;
+using static PostFundManagement.Application.Extensions.General;
 using static PostFundManagement.Domain.Extensions.Constants;
 
 namespace PostFundManagement.Application.Api.Filters;

PostFundManagement.Application/Communications/Events/SyncUserEvent.cs

@@ -1,9 +0,0 @@
-using PostFundManagement.Application.Abstractions;
-using PostFundManagement.Domain.Abstractions;
-
-namespace PostFundManagement.Application.Communications.Events;
-
-public class SyncUserEvent : EventBase, IEvent
-{
-    public string Name { get; set; } = nameof(SyncUserEvent);
-}

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;

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<IError> errors) => new()
+    {
+        Detail = string.Join(',', errors.Select(e => e.Message)),
+        Status = StatusCodes.Status400BadRequest,
+        Title = errors[0]?.Message,
+    };
 }

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
 {

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
 {

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;
 

PostFundManagement.Application/Extensions/Security.cs

@@ -1,10 +1,9 @@
-using PostFundManagement.Application.Extensions;
+using PostFundManagement.Application.Services.Shared;
-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
 {

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<ApplicationDbContext> contextFactory) : IService
 {

PostFundManagement.Application/Services/Communications/Events/SyncUserEvent.cs

@@ -1,4 +1,12 @@
-namespace PostFundManagement.Application.Communications.Events;
+using PostFundManagement.Application.Abstractions;
+using PostFundManagement.Domain.Abstractions;
+
+namespace PostFundManagement.Application.Services.Communications.Events;
+
+public class SyncUserEvent : EventBase, IEvent
+{
+    public string Name { get; set; } = nameof(SyncUserEvent);
+}
 
 public class SyncUserEventHandler(ILogger<SyncUserEvent> logger) : INotificationHandler<SyncUserEvent>
 {

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);

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<ApplicationDbContext> contextFactory, HashService hashService, 
     [FromKeyedServices(Constants.EvidenceBucketName)] IS3Service s3Service) : IService

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);
 

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<ApplicationDbContext> contextFactory, HashService hashService) : IService
 {

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);
 

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<ApplicationDbContext> contextFactory, HashService hashService) : IService
 {

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);
 

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<ApplicationDbContext> contextFactory, HashService hashService) : IService
 {

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);
 

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<ApplicationDbContext> contextFactory, HashService hashService) : IService
 {

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);
 

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)
 {

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

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<SmtpSettings> options) : IDisposable
 {

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

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

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<ApplicationDbContext> contextFactory) : IService
 {

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<SecurityClientSettings> clientOptions)
 {

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);

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<ApplicationDbContext> contextFactory) : IService
 {

PostFundManagement.Domain/Api/Configuration/MachineIdentity.cs

@@ -1,4 +1,4 @@
-namespace PostFundManagement.Infrastructure.Configuration;
+namespace PostFundManagement.Domain.Api.Configuration;
 
 public sealed class MachineIdentity
 {

PostFundManagement.Domain/Extensions/General.cs

@@ -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<IError> errors) => new()
-    {
-        Detail = string.Join(',', errors.Select(e => e.Message)),
-        Status = StatusCodes.Status400BadRequest,        
-        Title = errors[0]?.Message,
-    };
-}