From 02ad819da9e851cd0282be24b26ef6f7bc0907a4 Mon Sep 17 00:00:00 2001 From: TekH Date: Wed, 28 Jan 2026 13:43:34 +0100 Subject: [PATCH] Refactor EnvelopeReceiverController to use MediatR only Remove all usage of IEnvelopeReceiverService from EnvelopeReceiverController, including constructor injection and obsolete attributes. Update endpoints to exclusively use MediatR for handling queries. Clean up related obsolete code, comments, and unused usings. Update documentation to reflect these changes. --- .../Controllers/EnvelopeReceiverController.cs | 59 +++---------------- 1 file changed, 8 insertions(+), 51 deletions(-) diff --git a/EnvelopeGenerator.GeneratorAPI/Controllers/EnvelopeReceiverController.cs b/EnvelopeGenerator.GeneratorAPI/Controllers/EnvelopeReceiverController.cs index d5aa77ce..05fcfec3 100644 --- a/EnvelopeGenerator.GeneratorAPI/Controllers/EnvelopeReceiverController.cs +++ b/EnvelopeGenerator.GeneratorAPI/Controllers/EnvelopeReceiverController.cs @@ -1,5 +1,4 @@ using AutoMapper; -using DigitalData.Core.Abstraction.Application.DTO; using EnvelopeGenerator.Application.EnvelopeReceivers.Commands; using EnvelopeGenerator.Application.EnvelopeReceivers.Queries; using EnvelopeGenerator.Application.Envelopes.Queries; @@ -11,12 +10,8 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.Data.SqlClient; using Microsoft.Extensions.Options; using System.Data; -using System.Reflection.Metadata; -using EnvelopeGenerator.Domain; -using EnvelopeGenerator.Domain.Constants; using EnvelopeGenerator.Application.Common.SQL; using EnvelopeGenerator.Application.Common.Dto.Receiver; -using EnvelopeGenerator.Application.Common.Interfaces.Services; using EnvelopeGenerator.Application.Common.Interfaces.SQLExecutor; namespace EnvelopeGenerator.GeneratorAPI.Controllers; @@ -33,38 +28,19 @@ namespace EnvelopeGenerator.GeneratorAPI.Controllers; public class EnvelopeReceiverController : ControllerBase { private readonly ILogger _logger; - - [Obsolete("Use MediatR")] - private readonly IEnvelopeReceiverService _erService; - private readonly IMediator _mediator; - private readonly IMapper _mapper; - private readonly IEnvelopeExecutor _envelopeExecutor; - private readonly IEnvelopeReceiverExecutor _erExecutor; - private readonly IDocumentExecutor _documentExecutor; - private readonly string _cnnStr; /// /// Konstruktor für den EnvelopeReceiverController. /// - /// Logger-Instanz zur Protokollierung von Informationen und Fehlern. - /// Service zur Verwaltung von Umschlagempfängern. - /// Mediator-Instanz zur Verarbeitung von Befehlen und Abfragen. - /// - /// - /// - /// - /// - [Obsolete("Use MediatR")] - public EnvelopeReceiverController(ILogger logger, IEnvelopeReceiverService envelopeReceiverService, IMediator mediator, IMapper mapper, IEnvelopeExecutor envelopeExecutor, IEnvelopeReceiverExecutor erExecutor, IDocumentExecutor documentExecutor, IOptions csOpt) + public EnvelopeReceiverController(ILogger logger, IMediator mediator, IMapper mapper, IEnvelopeExecutor envelopeExecutor, IEnvelopeReceiverExecutor erExecutor, IDocumentExecutor documentExecutor, IOptions csOpt) { _logger = logger; - _erService = envelopeReceiverService; _mediator = mediator; _mapper = mapper; _envelopeExecutor = envelopeExecutor; @@ -87,7 +63,6 @@ public class EnvelopeReceiverController : ControllerBase /// Ein unerwarteter Fehler ist aufgetreten. [Authorize] [HttpGet] - [Obsolete("Use MediatR")] public async Task GetEnvelopeReceiver([FromQuery] ReadEnvelopeReceiverQuery envelopeReceiver) { var username = User.GetUsernameOrDefault(); @@ -99,20 +74,11 @@ public class EnvelopeReceiverController : ControllerBase return StatusCode(StatusCodes.Status500InternalServerError); } - return await _erService.ReadByUsernameAsync( - username: username, - min_status: envelopeReceiver.Envelope.Status?.Min, - max_status: envelopeReceiver.Envelope.Status?.Max, - envelopeQuery: envelopeReceiver.Envelope, - receiverQuery: envelopeReceiver.Receiver, - ignore_statuses: envelopeReceiver.Envelope.Status?.Ignore ?? Array.Empty()) - .ThenAsync( - Success: Ok, - Fail: IActionResult (msg, ntc) => - { - _logger.LogNotice(ntc); - return StatusCode(StatusCodes.Status500InternalServerError, msg); - }); + envelopeReceiver = envelopeReceiver with { Username = username }; + + var result = await _mediator.Send(envelopeReceiver); + + return Ok(result); } /// @@ -129,19 +95,10 @@ public class EnvelopeReceiverController : ControllerBase /// Ein unerwarteter Fehler ist aufgetreten. [Authorize] [HttpGet("salute")] - [Obsolete("Use MediatR")] public async Task GetReceiverName([FromQuery] ReadReceiverNameQuery receiver) { - return await _erService.ReadLastUsedReceiverNameByMailAsync(receiver.EmailAddress, receiver.Id, receiver.Signature).ThenAsync( - Success: res => res is null ? NotFound() : Ok(res), - Fail: IActionResult (msg, ntc) => - { - if (ntc.HasFlag(Flag.NotFound)) - return NotFound(); - - _logger.LogNotice(ntc); - return StatusCode(StatusCodes.Status500InternalServerError); - }); + var name = await _mediator.Send(receiver); + return name is null ? NotFound() : Ok(name); } ///