From b43399ad0189cc28fc90d6bc04e88948349b6796 Mon Sep 17 00:00:00 2001
From: TekH <h.tek@digitaldata.works>
Date: Mon, 8 Sep 2025 16:16:22 +0200
Subject: [PATCH] fix(EGDbContext): add Envelope-property to Envelope-History
 relation definition on model builder

---
 .../Queries/ReadEnvelopeReceiverQuery.cs      |  3 +-
 .../Queries/ReadHistoryQueryHandler.cs        |  2 +-
 .../EGDbContext.cs                            |  7 +---
 .../Test/TestEnvelopeHistoryController.cs     | 39 +++++++------------
 4 files changed, 17 insertions(+), 34 deletions(-)

diff --git a/EnvelopeGenerator.Application/EnvelopeReceivers/Queries/ReadEnvelopeReceiverQuery.cs b/EnvelopeGenerator.Application/EnvelopeReceivers/Queries/ReadEnvelopeReceiverQuery.cs
index f7f8e7e4..d1873921 100644
--- a/EnvelopeGenerator.Application/EnvelopeReceivers/Queries/ReadEnvelopeReceiverQuery.cs
+++ b/EnvelopeGenerator.Application/EnvelopeReceivers/Queries/ReadEnvelopeReceiverQuery.cs
@@ -9,6 +9,7 @@ using EnvelopeGenerator.Application.Receivers.Queries;
 using MediatR;
 using EnvelopeGenerator.Domain.Entities;
 using Microsoft.EntityFrameworkCore;
+using EnvelopeGenerator.Application.SQL;
 
 namespace EnvelopeGenerator.Application.EnvelopeReceivers.Queries;
 
@@ -138,6 +139,6 @@ public class ReadEnvelopeReceiverQueryHandler : IRequestHandler<ReadEnvelopeRece
                         .Include(er => er.Receiver)
                         .ToListAsync(cancel);
 
-        return _mapper.Map<IEnumerable<EnvelopeReceiverDto>>(envRcvs);
+        return _mapper.Map<List<EnvelopeReceiverDto>>(envRcvs);
     }
 } 
\ No newline at end of file
diff --git a/EnvelopeGenerator.Application/Histories/Queries/ReadHistoryQueryHandler.cs b/EnvelopeGenerator.Application/Histories/Queries/ReadHistoryQueryHandler.cs
index ba558303..1b399c44 100644
--- a/EnvelopeGenerator.Application/Histories/Queries/ReadHistoryQueryHandler.cs
+++ b/EnvelopeGenerator.Application/Histories/Queries/ReadHistoryQueryHandler.cs
@@ -42,6 +42,6 @@ public class ReadHistoryQueryHandler : IRequestHandler<ReadHistoryQuery, IEnumer
             query = query.Where(h => h.Status == request.Status);
 
         var hists = await query.ToListAsync(cancel);
-        return _mapper.Map<IEnumerable<EnvelopeHistoryDto>>(hists);
+        return _mapper.Map<List<EnvelopeHistoryDto>>(hists);
     }
 }
\ No newline at end of file
diff --git a/EnvelopeGenerator.Infrastructure/EGDbContext.cs b/EnvelopeGenerator.Infrastructure/EGDbContext.cs
index 4d9aefbe..4860d87a 100644
--- a/EnvelopeGenerator.Infrastructure/EGDbContext.cs
+++ b/EnvelopeGenerator.Infrastructure/EGDbContext.cs
@@ -117,7 +117,7 @@ public class EGDbContext : DbContext, IUserManagerDbContext, IMailDbContext
 
         modelBuilder.Entity<Envelope>()
             .HasMany(e => e.Histories)
-            .WithOne()
+            .WithOne(h => h.Envelope)
             .HasForeignKey(hist => hist.EnvelopeId);
         #endregion Envelope
 
@@ -174,11 +174,6 @@ public class EGDbContext : DbContext, IUserManagerDbContext, IMailDbContext
             .WithMany()
             .HasForeignKey(ds => ds.EnvelopeId);
 
-        modelBuilder.Entity<DocumentStatus>()
-            .HasOne(ds => ds.Receiver)
-            .WithMany()
-            .HasForeignKey(ds => ds.ReceiverId);
-
         modelBuilder.Entity<DocumentStatus>()
             .HasOne(ds => ds.Receiver)
             .WithMany()
diff --git a/EnvelopeGenerator.Web/Controllers/Test/TestEnvelopeHistoryController.cs b/EnvelopeGenerator.Web/Controllers/Test/TestEnvelopeHistoryController.cs
index 498879cd..b8acab29 100644
--- a/EnvelopeGenerator.Web/Controllers/Test/TestEnvelopeHistoryController.cs
+++ b/EnvelopeGenerator.Web/Controllers/Test/TestEnvelopeHistoryController.cs
@@ -1,37 +1,24 @@
-using DigitalData.Core.API;
-using EnvelopeGenerator.Application.Interfaces.Services;
-using EnvelopeGenerator.Application.Dto.EnvelopeHistory;
-using EnvelopeGenerator.Domain.Entities;
-using Microsoft.AspNetCore.Mvc;
-using EnvelopeGenerator.Domain.Constants;
+using Microsoft.AspNetCore.Mvc;
+using MediatR;
+using EnvelopeGenerator.Application.Histories.Queries;
 
 namespace EnvelopeGenerator.Web.Controllers.Test;
 
-[Obsolete("Use MediatR")]
-public class TestEnvelopeHistoryController : CRUDControllerBase<IEnvelopeHistoryService, EnvelopeHistoryCreateDto, EnvelopeHistoryDto, EnvelopeHistoryDto, EnvelopeHistory, long>
+[ApiController]
+[Route("api/[controller]")]
+public class TestEnvelopeHistoryController : ControllerBase
 {
-    public TestEnvelopeHistoryController(ILogger<TestEnvelopeHistoryController> logger, IEnvelopeHistoryService service) : base(logger, service)
-    {
-    }
+    ILogger<TestEnvelopeHistoryController> _logger;
 
-    [HttpGet("Count")]
-    public async Task<IActionResult> Count(int? envelopeId = null, string? userReference = null, EnvelopeStatus? status = null)
-    {
-        return Ok(await _service.CountAsync(envelopeId, userReference, status));
-    }
+    private readonly IMediator _mediator;
 
-    [HttpGet("is-ac-req")]
-    public async Task<IActionResult> AccessCodeAlreadyRequested(int envelopeId, string userReference)
+    public TestEnvelopeHistoryController(ILogger<TestEnvelopeHistoryController> logger, IMediator mediator)
     {
-        return Ok(await _service.AccessCodeAlreadyRequested(envelopeId, userReference));
+        _logger = logger;
+        _mediator = mediator;
     }
 
     [HttpGet]
-    public async Task<IActionResult> GetAsyncWith(int? envelopeId = null, string? userReference = null, EnvelopeStatus? status = null)
-    {
-        return Ok(await _service.ReadAsync(envelopeId: envelopeId, userReference: userReference, status: status));
-    }
-
-    [NonAction]
-    public override Task<IActionResult> GetAll() => base.GetAll();
+    public async Task<IActionResult> Get([FromQuery] ReadHistoryQuery readHistoryQuery, CancellationToken cancel)
+        => Ok(await _mediator.Send(readHistoryQuery, cancel));
 }
\ No newline at end of file