fix conflicts after updates

EnvelopeGenerator.Application/Documents/Queries/ReadDocumentQuery.cs

@@ -2,6 +2,8 @@
 using EnvelopeGenerator.Application.Dto;
 using MediatR;
 using EnvelopeGenerator.Domain.Entities;
+using Microsoft.EntityFrameworkCore;
+using AutoMapper;
 
 namespace EnvelopeGenerator.Application.Documents.Queries;
 
@@ -24,13 +26,16 @@ public class ReadDocumentQueryHandler : IRequestHandler<ReadDocumentQuery, Envel
     /// </summary>
     private readonly IRepository<EnvelopeDocument> _repo;
 
+    private readonly IMapper _mapper;
+
     /// <summary>
     /// Initializes a new instance of the <see cref="ReadDocumentQueryHandler"/> class.
     /// </summary>
     /// <param name="envelopeDocumentRepository">The repository used to access <see cref="EnvelopeDocument"/> entities.</param>
-    public ReadDocumentQueryHandler(IRepository<EnvelopeDocument> envelopeDocumentRepository)
+    public ReadDocumentQueryHandler(IRepository<EnvelopeDocument> envelopeDocumentRepository, IMapper mapper)
     {
         _repo = envelopeDocumentRepository;
+        _mapper = mapper;
     }
 
     /// <summary>
@@ -48,9 +53,15 @@ public class ReadDocumentQueryHandler : IRequestHandler<ReadDocumentQuery, Envel
     public async Task<EnvelopeDocumentDto?> Handle(ReadDocumentQuery query, CancellationToken cancellationToken)
     {
         if (query.Id is not null)
-            return await _repo.ReadOrDefaultAsync<EnvelopeDocumentDto>(d => d.Id == query.Id);
+        {
+            var doc = await _repo.ReadOnly().Where(d => d.Id == query.Id).FirstOrDefaultAsync();
+            return _mapper.Map<EnvelopeDocumentDto>(doc);
+        }            
         else if (query.EnvelopeId is not null)
-            return await _repo.ReadOrDefaultAsync<EnvelopeDocumentDto>(d => d.EnvelopeId == query.EnvelopeId);
+        {
+            var doc = await _repo.ReadOnly().Where(d => d.EnvelopeId == query.EnvelopeId).FirstOrDefaultAsync();
+            return _mapper.Map<EnvelopeDocumentDto>(doc);
+        }
 
         throw new InvalidOperationException(
             $"Invalid {nameof(ReadDocumentQuery)}: either {nameof(query.Id)} or {nameof(query.EnvelopeId)} must be provided.");