AppStd/EnvelopeGenerator
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix(EGDbContext): add Envelope-property to Envelope-History relation definition on model builder

Browse Source
This commit is contained in:
tekh 2025-09-08 16:16:22 +02:00
parent f41f26b810
commit b43399ad01
4 changed files with 17 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
EnvelopeGenerator.Application/EnvelopeReceivers/Queries/ReadEnvelopeReceiverQuery.cs
View File

@ -9,6 +9,7 @@ using EnvelopeGenerator.Application.Receivers.Queries;
using MediatR; using MediatR;
using EnvelopeGenerator.Domain.Entities; using EnvelopeGenerator.Domain.Entities;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using EnvelopeGenerator.Application.SQL;
namespace EnvelopeGenerator.Application.EnvelopeReceivers.Queries; namespace EnvelopeGenerator.Application.EnvelopeReceivers.Queries;
@ -138,6 +139,6 @@ public class ReadEnvelopeReceiverQueryHandler : IRequestHandler<ReadEnvelopeRece
.Include(er => er.Receiver) .Include(er => er.Receiver)
.ToListAsync(cancel); .ToListAsync(cancel);
return _mapper.Map<IEnumerable<EnvelopeReceiverDto>>(envRcvs); return _mapper.Map<List<EnvelopeReceiverDto>>(envRcvs);
} }
} }

2
EnvelopeGenerator.Application/Histories/Queries/ReadHistoryQueryHandler.cs
View File

@ -42,6 +42,6 @@ public class ReadHistoryQueryHandler : IRequestHandler<ReadHistoryQuery, IEnumer
query = query.Where(h => h.Status == request.Status); query = query.Where(h => h.Status == request.Status);
var hists = await query.ToListAsync(cancel); var hists = await query.ToListAsync(cancel);
return _mapper.Map<IEnumerable<EnvelopeHistoryDto>>(hists); return _mapper.Map<List<EnvelopeHistoryDto>>(hists);
} }
} }

7
EnvelopeGenerator.Infrastructure/EGDbContext.cs
View File

@ -117,7 +117,7 @@ public class EGDbContext : DbContext, IUserManagerDbContext, IMailDbContext
modelBuilder.Entity<Envelope>() modelBuilder.Entity<Envelope>()
.HasMany(e => e.Histories) .HasMany(e => e.Histories)
.WithOne() .WithOne(h => h.Envelope)
.HasForeignKey(hist => hist.EnvelopeId); .HasForeignKey(hist => hist.EnvelopeId);
#endregion Envelope #endregion Envelope
@ -174,11 +174,6 @@ public class EGDbContext : DbContext, IUserManagerDbContext, IMailDbContext
.WithMany() .WithMany()
.HasForeignKey(ds => ds.EnvelopeId); .HasForeignKey(ds => ds.EnvelopeId);
modelBuilder.Entity<DocumentStatus>()
.HasOne(ds => ds.Receiver)
.WithMany()
.HasForeignKey(ds => ds.ReceiverId);
modelBuilder.Entity<DocumentStatus>() modelBuilder.Entity<DocumentStatus>()
.HasOne(ds => ds.Receiver) .HasOne(ds => ds.Receiver)
.WithMany() .WithMany()

39
EnvelopeGenerator.Web/Controllers/Test/TestEnvelopeHistoryController.cs
View File

@ -1,37 +1,24 @@
using DigitalData.Core.API; using Microsoft.AspNetCore.Mvc;
using EnvelopeGenerator.Application.Interfaces.Services; using MediatR;
using EnvelopeGenerator.Application.Dto.EnvelopeHistory; using EnvelopeGenerator.Application.Histories.Queries;
using EnvelopeGenerator.Domain.Entities;
using Microsoft.AspNetCore.Mvc;
using EnvelopeGenerator.Domain.Constants;
namespace EnvelopeGenerator.Web.Controllers.Test; namespace EnvelopeGenerator.Web.Controllers.Test;
[Obsolete("Use MediatR")] [ApiController]
public class TestEnvelopeHistoryController : CRUDControllerBase<IEnvelopeHistoryService, EnvelopeHistoryCreateDto, EnvelopeHistoryDto, EnvelopeHistoryDto, EnvelopeHistory, long> [Route("api/[controller]")]
public class TestEnvelopeHistoryController : ControllerBase
{ {
public TestEnvelopeHistoryController(ILogger<TestEnvelopeHistoryController> logger, IEnvelopeHistoryService service) : base(logger, service) ILogger<TestEnvelopeHistoryController> _logger;
{
}
[HttpGet("Count")] private readonly IMediator _mediator;
public async Task<IActionResult> Count(int? envelopeId = null, string? userReference = null, EnvelopeStatus? status = null)
{
return Ok(await _service.CountAsync(envelopeId, userReference, status));
}
[HttpGet("is-ac-req")] public TestEnvelopeHistoryController(ILogger<TestEnvelopeHistoryController> logger, IMediator mediator)
public async Task<IActionResult> AccessCodeAlreadyRequested(int envelopeId, string userReference)
{ {
return Ok(await _service.AccessCodeAlreadyRequested(envelopeId, userReference)); _logger = logger;
_mediator = mediator;
} }
[HttpGet] [HttpGet]
public async Task<IActionResult> GetAsyncWith(int? envelopeId = null, string? userReference = null, EnvelopeStatus? status = null) public async Task<IActionResult> Get([FromQuery] ReadHistoryQuery readHistoryQuery, CancellationToken cancel)
{ => Ok(await _mediator.Send(readHistoryQuery, cancel));
return Ok(await _service.ReadAsync(envelopeId: envelopeId, userReference: userReference, status: status));
}
[NonAction]
public override Task<IActionResult> GetAll() => base.GetAll();
} }