Merge pull request #33 from bsandmann/dev

code clean up
bsandmann · Feb 25, 2025 · 553d08b · 553d08b
2 parents 6ba428a + 43ba807
commit 553d08b
Show file tree

Hide file tree

Showing 60 changed files with 519 additions and 1,184 deletions.
diff --git a/Blocktrust.CredentialWorkflow.Core/Commands/DIDComm/DeletePeerDID/DeletePeerDIDHandler.cs b/Blocktrust.CredentialWorkflow.Core/Commands/DIDComm/DeletePeerDID/DeletePeerDIDHandler.cs
@@ -1,35 +1,33 @@
-using Blocktrust.CredentialWorkflow.Core.Entities.DIDComm;
 using FluentResults;
 using MediatR;
 using Microsoft.EntityFrameworkCore;
 
-namespace Blocktrust.CredentialWorkflow.Core.Commands.DIDComm.DeletePeerDID
+namespace Blocktrust.CredentialWorkflow.Core.Commands.DIDComm.DeletePeerDID;
+
+public class DeletePeerDIDHandler : IRequestHandler<DeletePeerDIDRequest, Result>
 {
-    public class DeletePeerDIDHandler : IRequestHandler<DeletePeerDIDRequest, Result>
-    {
-        private readonly DataContext _context;
+    private readonly DataContext _context;
 
-        public DeletePeerDIDHandler(DataContext context)
-        {
-            _context = context;
-        }
+    public DeletePeerDIDHandler(DataContext context)
+    {
+        _context = context;
+    }
 
-        public async Task<Result> Handle(DeletePeerDIDRequest request, CancellationToken cancellationToken)
-        {
-            _context.ChangeTracker.Clear();
+    public async Task<Result> Handle(DeletePeerDIDRequest request, CancellationToken cancellationToken)
+    {
+        _context.ChangeTracker.Clear();
 
-            var peerDIDEntity = await _context.PeerDIDEntities
-                .FirstOrDefaultAsync(p => p.PeerDIDEntityId == request.PeerDIDEntityId, cancellationToken);
+        var peerDIDEntity = await _context.PeerDIDEntities
+            .FirstOrDefaultAsync(p => p.PeerDIDEntityId == request.PeerDIDEntityId, cancellationToken);
 
-            if (peerDIDEntity is null)
-            {
-                return Result.Fail("The PeerDID does not exist in the database. It cannot be deleted.");
-            }
+        if (peerDIDEntity is null)
+        {
+            return Result.Fail("The PeerDID does not exist in the database. It cannot be deleted.");
+        }
 
-            _context.PeerDIDEntities.Remove(peerDIDEntity);
-            await _context.SaveChangesAsync(cancellationToken);
+        _context.PeerDIDEntities.Remove(peerDIDEntity);
+        await _context.SaveChangesAsync(cancellationToken);
 
-            return Result.Ok();
-        }
+        return Result.Ok();
     }
 }
diff --git a/Blocktrust.CredentialWorkflow.Core/Commands/DIDComm/DeletePeerDID/DeletePeerDIDRequest.cs b/Blocktrust.CredentialWorkflow.Core/Commands/DIDComm/DeletePeerDID/DeletePeerDIDRequest.cs
@@ -1,15 +1,14 @@
 using FluentResults;
 using MediatR;
 
-namespace Blocktrust.CredentialWorkflow.Core.Commands.DIDComm.DeletePeerDID
+namespace Blocktrust.CredentialWorkflow.Core.Commands.DIDComm.DeletePeerDID;
+
+public class DeletePeerDIDRequest : IRequest<Result>
 {
-    public class DeletePeerDIDRequest : IRequest<Result>
+    public DeletePeerDIDRequest(Guid peerDIDEntityId)
     {
-        public DeletePeerDIDRequest(Guid peerDIDEntityId)
-        {
-            PeerDIDEntityId = peerDIDEntityId;
-        }
-
-        public Guid PeerDIDEntityId { get; }
+        PeerDIDEntityId = peerDIDEntityId;
     }
+
+    public Guid PeerDIDEntityId { get; }
 }
diff --git a/...st.CredentialWorkflow.Core/Commands/DIDComm/GetPeerDIDSecrets/GetPeerDIDSecretsHandler.cs b/...st.CredentialWorkflow.Core/Commands/DIDComm/GetPeerDIDSecrets/GetPeerDIDSecretsHandler.cs
@@ -1,11 +1,11 @@
-namespace Blocktrust.CredentialWorkflow.Core.Commands.DIDComm.GetPeerDIDSecrets;
-
 using Blocktrust.Common.Models.DidDoc;
 using Blocktrust.Common.Models.Secrets;
 using FluentResults;
 using MediatR;
 using Microsoft.EntityFrameworkCore;
 
+namespace Blocktrust.CredentialWorkflow.Core.Commands.DIDComm.GetPeerDIDSecrets;
+
 public class GetPeerDIDSecretsHandler : IRequestHandler<GetPeerDIDSecretsRequest, Result<List<Secret>>>
 {
     private readonly DataContext _context;
@@ -17,7 +17,7 @@ public class GetPeerDIDSecretsHandler : IRequestHandler<GetPeerDIDSecretsRequest
     /// <param name="context"></param>
     public GetPeerDIDSecretsHandler(DataContext context)
     {
-        this._context = context;
+        _context = context;
     }
 
     /// <summary>

diff --git a/...st.CredentialWorkflow.Core/Commands/DIDComm/GetPeerDIDSecrets/GetPeerDIDSecretsRequest.cs b/...st.CredentialWorkflow.Core/Commands/DIDComm/GetPeerDIDSecrets/GetPeerDIDSecretsRequest.cs
@@ -1,9 +1,9 @@
-namespace Blocktrust.CredentialWorkflow.Core.Commands.DIDComm.GetPeerDIDSecrets;
-
 using Blocktrust.Common.Models.Secrets;
 using FluentResults;
 using MediatR;
 
+namespace Blocktrust.CredentialWorkflow.Core.Commands.DIDComm.GetPeerDIDSecrets;
+
 public class GetPeerDIDSecretsRequest : IRequest<Result<List<Secret>>>
 {
     public List<string> Kids { get; }

diff --git a/Blocktrust.CredentialWorkflow.Core/Commands/DIDComm/GetPeerDIDs/GetPeerDIDsHandler.cs b/Blocktrust.CredentialWorkflow.Core/Commands/DIDComm/GetPeerDIDs/GetPeerDIDsHandler.cs
@@ -1,37 +1,34 @@
-using Blocktrust.CredentialWorkflow.Core.Entities.DIDComm;
 using FluentResults;
 using MediatR;
 using Microsoft.EntityFrameworkCore;
 
-namespace Blocktrust.CredentialWorkflow.Core.Commands.DIDComm.GetPeerDIDs
-{
-    using Domain.PeerDID;
+namespace Blocktrust.CredentialWorkflow.Core.Commands.DIDComm.GetPeerDIDs;
 
-    public class GetPeerDIDsHandler : IRequestHandler<GetPeerDIDsRequest, Result<List<PeerDIDModel>>>
-    {
-        private readonly DataContext _context;
+using Domain.PeerDID;
 
-        public GetPeerDIDsHandler(DataContext context)
-        {
-            _context = context;
-        }
+public class GetPeerDIDsHandler : IRequestHandler<GetPeerDIDsRequest, Result<List<PeerDIDModel>>>
+{
+    private readonly DataContext _context;
 
-        public async Task<Result<List<PeerDIDModel>>> Handle(GetPeerDIDsRequest request, CancellationToken cancellationToken)
-        {
-            _context.ChangeTracker.Clear();
+    public GetPeerDIDsHandler(DataContext context)
+    {
+        _context = context;
+    }
 
-            var peerDIDEntities = await _context.PeerDIDEntities
-                .Where(p => p.TenantEntityId == request.TenantId)
-                .ToListAsync(cancellationToken);
+    public async Task<Result<List<PeerDIDModel>>> Handle(GetPeerDIDsRequest request, CancellationToken cancellationToken)
+    {
+        _context.ChangeTracker.Clear();
 
-            // If none found, we can return an empty list as a success
-            if (peerDIDEntities is null || peerDIDEntities.Count == 0)
-            {
-                return Result.Ok(new List<PeerDIDModel>());
-            }
+        var peerDIDEntities = await _context.PeerDIDEntities
+            .Where(p => p.TenantEntityId == request.TenantId)
+            .ToListAsync(cancellationToken);
 
-            var peerDIDs = peerDIDEntities.Select(p => p.ToModel()).ToList();
-            return Result.Ok(peerDIDs);
+        if (peerDIDEntities is null || peerDIDEntities.Count == 0)
+        {
+            return Result.Ok(new List<PeerDIDModel>());
         }
+
+        var peerDIDs = peerDIDEntities.Select(p => p.ToModel()).ToList();
+        return Result.Ok(peerDIDs);
     }
 }
diff --git a/Blocktrust.CredentialWorkflow.Core/Commands/DIDComm/GetPeerDIDs/GetPeerDIDsRequest.cs b/Blocktrust.CredentialWorkflow.Core/Commands/DIDComm/GetPeerDIDs/GetPeerDIDsRequest.cs
@@ -1,17 +1,16 @@
 using FluentResults;
 using MediatR;
 
-namespace Blocktrust.CredentialWorkflow.Core.Commands.DIDComm.GetPeerDIDs
-{
-    using Domain.PeerDID;
+namespace Blocktrust.CredentialWorkflow.Core.Commands.DIDComm.GetPeerDIDs;
 
-    public class GetPeerDIDsRequest : IRequest<Result<List<PeerDIDModel>>>
-    {
-        public GetPeerDIDsRequest(Guid tenantId)
-        {
-            TenantId = tenantId;
-        }
+using Domain.PeerDID;
 
-        public Guid TenantId { get; }
+public class GetPeerDIDsRequest : IRequest<Result<List<PeerDIDModel>>>
+{
+    public GetPeerDIDsRequest(Guid tenantId)
+    {
+        TenantId = tenantId;
     }
+
+    public Guid TenantId { get; }
 }
diff --git a/Blocktrust.CredentialWorkflow.Core/Commands/DIDComm/GetPeerDidById/GetPeerDidByIdHandler.cs b/Blocktrust.CredentialWorkflow.Core/Commands/DIDComm/GetPeerDidById/GetPeerDidByIdHandler.cs
@@ -1,34 +1,32 @@
-using Blocktrust.CredentialWorkflow.Core.Entities.DIDComm;
 using FluentResults;
 using MediatR;
 using Microsoft.EntityFrameworkCore;
 
-namespace Blocktrust.CredentialWorkflow.Core.Commands.DIDComm.GetPeerDidById
-{
-    using Domain.PeerDID;
+namespace Blocktrust.CredentialWorkflow.Core.Commands.DIDComm.GetPeerDidById;
 
-    public class GetPeerDidByIdHandler : IRequestHandler<GetPeerDidByIdRequest, Result<PeerDIDModel>>
-    {
-        private readonly DataContext _context;
+using Domain.PeerDID;
 
-        public GetPeerDidByIdHandler(DataContext context)
-        {
-            _context = context;
-        }
+public class GetPeerDidByIdHandler : IRequestHandler<GetPeerDidByIdRequest, Result<PeerDIDModel>>
+{
+    private readonly DataContext _context;
 
-        public async Task<Result<PeerDIDModel>> Handle(GetPeerDidByIdRequest request, CancellationToken cancellationToken)
-        {
-            _context.ChangeTracker.Clear();
+    public GetPeerDidByIdHandler(DataContext context)
+    {
+        _context = context;
+    }
 
-            var peerDIDEntity = await _context.PeerDIDEntities
-                .FirstOrDefaultAsync(p => p.PeerDIDEntityId == request.PeerDidEntityId, cancellationToken);
+    public async Task<Result<PeerDIDModel>> Handle(GetPeerDidByIdRequest request, CancellationToken cancellationToken)
+    {
+        _context.ChangeTracker.Clear();
 
-            if (peerDIDEntity is null)
-            {
-                return Result.Fail($"PeerDID with ID '{request.PeerDidEntityId}' not found.");
-            }
+        var peerDIDEntity = await _context.PeerDIDEntities
+            .FirstOrDefaultAsync(p => p.PeerDIDEntityId == request.PeerDidEntityId, cancellationToken);
 
-            return Result.Ok(peerDIDEntity.ToModel());
+        if (peerDIDEntity is null)
+        {
+            return Result.Fail($"PeerDID with ID '{request.PeerDidEntityId}' not found.");
         }
+
+        return Result.Ok(peerDIDEntity.ToModel());
     }
 }
diff --git a/Blocktrust.CredentialWorkflow.Core/Commands/DIDComm/GetPeerDidById/GetPeerDidByIdRequest.cs b/Blocktrust.CredentialWorkflow.Core/Commands/DIDComm/GetPeerDidById/GetPeerDidByIdRequest.cs
@@ -1,17 +1,16 @@
 using FluentResults;
 using MediatR;
 
-namespace Blocktrust.CredentialWorkflow.Core.Commands.DIDComm.GetPeerDidById
+namespace Blocktrust.CredentialWorkflow.Core.Commands.DIDComm.GetPeerDidById;
+
+using Domain.PeerDID;
+
+public class GetPeerDidByIdRequest : IRequest<Result<PeerDIDModel>>
 {
-    using Domain.PeerDID;
+    public Guid PeerDidEntityId { get; }
 
-    public class GetPeerDidByIdRequest : IRequest<Result<PeerDIDModel>>
+    public GetPeerDidByIdRequest(Guid peerDidEntityId)
     {
-        public Guid PeerDidEntityId { get; }
-
-        public GetPeerDidByIdRequest(Guid peerDidEntityId)
-        {
-            PeerDidEntityId = peerDidEntityId;
-        }
+        PeerDidEntityId = peerDidEntityId;
     }
 }
diff --git a/Blocktrust.CredentialWorkflow.Core/Commands/DIDComm/SavePeerDID/SavePeerDIDHandler.cs b/Blocktrust.CredentialWorkflow.Core/Commands/DIDComm/SavePeerDID/SavePeerDIDHandler.cs
@@ -1,50 +1,49 @@
-namespace Blocktrust.CredentialWorkflow.Core.Commands.DIDComm.SavePeerDID
+namespace Blocktrust.CredentialWorkflow.Core.Commands.DIDComm.SavePeerDID;
+
+using Blocktrust.CredentialWorkflow.Core.Entities.DIDComm;
+using Domain.PeerDID;
+using FluentResults;
+using MediatR;
+using Microsoft.EntityFrameworkCore;
+
+public class SavePeerDIDHandler : IRequestHandler<SavePeerDIDRequest, Result<PeerDIDModel>>
 {
-    using Blocktrust.CredentialWorkflow.Core.Entities.DIDComm;
-    using Domain.PeerDID;
-    using FluentResults;
-    using MediatR;
-    using Microsoft.EntityFrameworkCore;
+    private readonly DataContext _context;
 
-    public class SavePeerDIDHandler : IRequestHandler<SavePeerDIDRequest, Result<PeerDIDModel>>
+    public SavePeerDIDHandler(DataContext context)
     {
-        private readonly DataContext _context;
+        _context = context;
+    }
 
-        public SavePeerDIDHandler(DataContext context)
+    public async Task<Result<PeerDIDModel>> Handle(SavePeerDIDRequest request, CancellationToken cancellationToken)
+    {
+        _context.ChangeTracker.Clear();
+        _context.ChangeTracker.AutoDetectChangesEnabled = false;
+
+        // Validate tenant
+        var tenant = await _context.TenantEntities
+            .FirstOrDefaultAsync(t => t.TenantEntityId == request.TenantId, cancellationToken);
+
+        if (tenant is null)
         {
-            _context = context;
+            return Result.Fail("The tenant does not exist in the database. The PeerDID cannot be created.");
         }
 
-        public async Task<Result<PeerDIDModel>> Handle(SavePeerDIDRequest request, CancellationToken cancellationToken)
+        // Create the new PeerDIDEntity
+        var peerDIDEntity = new PeerDIDEntity
         {
-            _context.ChangeTracker.Clear();
-            _context.ChangeTracker.AutoDetectChangesEnabled = false;
-
-            // Validate tenant
-            var tenant = await _context.TenantEntities
-                .FirstOrDefaultAsync(t => t.TenantEntityId == request.TenantId, cancellationToken);
-
-            if (tenant is null)
-            {
-                return Result.Fail("The tenant does not exist in the database. The PeerDID cannot be created.");
-            }
-
-            // Create the new PeerDIDEntity
-            var peerDIDEntity = new PeerDIDEntity
-            {
-                PeerDIDEntityId = Guid.NewGuid(),
-                Name = request.Name,
-                PeerDID = request.PeerDID,
-                TenantEntityId = tenant.TenantEntityId,
-                CreatedUtc = DateTime.UtcNow
-            };
-
-            // Insert and save
-            await _context.PeerDIDEntities.AddAsync(peerDIDEntity, cancellationToken);
-            await _context.SaveChangesAsync(cancellationToken);
-
-            // Return the domain model
-            return Result.Ok(peerDIDEntity.ToModel());
-        }
+            PeerDIDEntityId = Guid.NewGuid(),
+            Name = request.Name,
+            PeerDID = request.PeerDID,
+            TenantEntityId = tenant.TenantEntityId,
+            CreatedUtc = DateTime.UtcNow
+        };
+
+        // Insert and save
+        await _context.PeerDIDEntities.AddAsync(peerDIDEntity, cancellationToken);
+        await _context.SaveChangesAsync(cancellationToken);
+
+        // Return the domain model
+        return Result.Ok(peerDIDEntity.ToModel());
     }
 }