diff --git a/EnvelopeGenerator.Application/Documents/Queries/ReadDocumentQuery.cs b/EnvelopeGenerator.Application/Documents/Queries/ReadDocumentQuery.cs index 34c7fd7a..03b2d0f8 100644 --- a/EnvelopeGenerator.Application/Documents/Queries/ReadDocumentQuery.cs +++ b/EnvelopeGenerator.Application/Documents/Queries/ReadDocumentQuery.cs @@ -53,14 +53,17 @@ public class ReadDocumentQueryHandler : IRequestHandler public async Task Handle(ReadDocumentQuery query, CancellationToken cancel) { + var docQuery = _repo.Query.Include(doc => doc.Elements).ThenInclude(e => e.Annotations); + if (query.Id is not null) { - var doc = await _repo.Query.Where(d => d.Id == query.Id).FirstOrDefaultAsync(cancel); + var doc = await docQuery.Where(d => d.Id == query.Id).FirstOrDefaultAsync(cancel); + return _mapper.Map(doc); } else if (query.EnvelopeId is not null) { - var doc = await _repo.Query.Where(d => d.EnvelopeId == query.EnvelopeId).FirstOrDefaultAsync(cancel); + var doc = await docQuery.Where(d => d.EnvelopeId == query.EnvelopeId).FirstOrDefaultAsync(cancel); return _mapper.Map(doc); }