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.");

EnvelopeGenerator.Application/EmailTemplates/Commands/Reset/ResetEmailTemplateCommandHandler.cs

@@ -2,6 +2,8 @@
 using EnvelopeGenerator.Application.Dto;
 using EnvelopeGenerator.Domain.Entities;
 using MediatR;
+using Microsoft.EntityFrameworkCore;
+using System.Linq;
 
 namespace EnvelopeGenerator.Application.EmailTemplates.Commands.Reset;
 
@@ -31,10 +33,10 @@ public class ResetEmailTemplateCommandHandler : IRequestHandler<ResetEmailTempla
     public async Task Handle(ResetEmailTemplateCommand request, CancellationToken cancel)
     {
         var temps = request.Id is not null
-            ? await _repository.ReadAllAsync<EmailTemplateDto>(t => t.Id == request.Id, cancel)
+            ? await _repository.ReadOnly().Where(t => t.Id == request.Id).ToListAsync(cancel)
             : request.Type is not null
-                ? await _repository.ReadAllAsync<EmailTemplateDto>(t => t.Name == request.Type.ToString(), cancel)
+                ? await _repository.ReadOnly().Where(t => t.Name == request.Type.ToString()).ToListAsync(cancel)
-                : await _repository.ReadAllAsync<EmailTemplateDto>(cancellation: cancel);
+                : await _repository.ReadOnly().ToListAsync(cancel);
 
         foreach (var temp in temps)
         {

EnvelopeGenerator.Application/EmailTemplates/Commands/Update/UpdateEmailTemplateCommandHandler.cs

@@ -1,9 +1,11 @@
-using DigitalData.Core.Abstraction.Application.Repository;
+using AutoMapper;
+using DigitalData.Core.Abstraction.Application.Repository;
 using EnvelopeGenerator.Application.Dto;
 using EnvelopeGenerator.Application.Exceptions;
 using EnvelopeGenerator.Domain;
 using EnvelopeGenerator.Domain.Entities;
 using MediatR;
+using Microsoft.EntityFrameworkCore;
 
 namespace EnvelopeGenerator.Application.EmailTemplates.Commands.Update;
 
@@ -14,13 +16,16 @@ public class UpdateEmailTemplateCommandHandler : IRequestHandler<UpdateEmailTemp
 {
     private readonly IRepository<EmailTemplate> _repository;
     
+    private readonly IMapper _mapper;
+
     /// <summary>
     /// 
     /// </summary>
     /// <param name="repository"></param>
-    public UpdateEmailTemplateCommandHandler(IRepository<EmailTemplate> repository)
+    public UpdateEmailTemplateCommandHandler(IRepository<EmailTemplate> repository, IMapper mapper)
     {
         _repository = repository;
+        _mapper = mapper;
     }
 
     /// <summary>
@@ -34,32 +39,34 @@ public class UpdateEmailTemplateCommandHandler : IRequestHandler<UpdateEmailTemp
     [Obsolete("Use Read-method returning IReadQuery<TEntity> instead.")]
     public async Task Handle(UpdateEmailTemplateCommand request, CancellationToken cancel)
     {
-        EmailTemplateDto? temp;
+        EmailTemplateDto? tempDto;
 
         if (request.EmailTemplateQuery?.Id is int id)
         {
-            temp = await _repository.ReadOrDefaultAsync<EmailTemplateDto>(t => t.Id == id, single: false, cancel);
+            var temp = await _repository.ReadOnly().Where(t => t.Id == id).FirstOrDefaultAsync(cancel);
+            tempDto = _mapper.Map<EmailTemplateDto>(temp);
         }
         else if (request!.EmailTemplateQuery!.Type is Constants.EmailTemplateType type)
         {
-            temp = await _repository.ReadOrDefaultAsync<EmailTemplateDto>(t => t.Name == type.ToString(), single: false, cancel);
+            var temp = await _repository.ReadOnly().Where(t => t.Name == type.ToString()).FirstOrDefaultAsync(cancel);
+            tempDto = _mapper.Map<EmailTemplateDto>(temp);
         }
         else
         {
             throw new InvalidOperationException("Both id and type is null. Id: " + request.EmailTemplateQuery.Id +". Type: " + request.EmailTemplateQuery.Type.ToString());
         }
 
-        if (temp == null)
+        if (tempDto == null)
         {
             throw new NotFoundException();
         }
 
         if (request.Body is not null)
-            temp.Body = request.Body;
+            tempDto.Body = request.Body;
 
         if (request.Subject is not null)
-            temp.Subject = request.Subject;
+            tempDto.Subject = request.Subject;
 
-        await _repository.UpdateAsync(temp, t => t.Id == temp.Id, cancel);
+        await _repository.UpdateAsync(tempDto, t => t.Id == tempDto.Id, cancel);
     }
 }

EnvelopeGenerator.Application/Interfaces/Repositories/IEnvelopeReceiverRepository.cs

@@ -1,4 +1,5 @@
 using DigitalData.Core.Abstraction.Application.Repository;
+using EnvelopeGenerator.Domain;
 using EnvelopeGenerator.Domain.Entities;
 
 namespace EnvelopeGenerator.Application.Interfaces.Repositories;
@@ -83,7 +84,7 @@ public interface IEnvelopeReceiverRepository : ICRUDRepository<EnvelopeReceiver,
     /// <param name="max_status"></param>
     /// <param name="ignore_statuses"></param>
     /// <returns></returns>
-    Task<IEnumerable<EnvelopeReceiver>> ReadByUsernameAsync(string username, int? min_status = null, int? max_status = null, params int[] ignore_statuses);
+    Task<IEnumerable<EnvelopeReceiver>> ReadByUsernameAsync(string username, Constants.EnvelopeStatus? min_status = null, Constants.EnvelopeStatus? max_status = null, params Constants.EnvelopeStatus[] ignore_statuses);
 
     /// <summary>
     /// 

EnvelopeGenerator.Application/Interfaces/Repositories/IEnvelopeRepository.cs

@@ -1,4 +1,5 @@
 using DigitalData.Core.Abstraction.Application.Repository;
+using EnvelopeGenerator.Domain;
 using EnvelopeGenerator.Domain.Entities;
 
 namespace EnvelopeGenerator.Application.Interfaces.Repositories;
@@ -38,5 +39,5 @@ public interface IEnvelopeRepository : ICRUDRepository<Envelope, int>
     /// <param name="max_status"></param>
     /// <param name="ignore_statuses"></param>
     /// <returns></returns>
-    Task<IEnumerable<Envelope>> ReadByUserAsync(int userId, int? min_status = null, int? max_status = null, params int[] ignore_statuses);
+    Task<IEnumerable<Envelope>> ReadByUserAsync(int userId, Constants.EnvelopeStatus? min_status = null, Constants.EnvelopeStatus? max_status = null, params Constants.EnvelopeStatus[] ignore_statuses);
 }

EnvelopeGenerator.Application/Interfaces/Services/IEnvelopeReceiverService.cs

@@ -6,6 +6,7 @@ using EnvelopeGenerator.Application.Dto.Messaging;
 using EnvelopeGenerator.Application.Envelopes;
 using EnvelopeGenerator.Application.Envelopes.Queries;
 using EnvelopeGenerator.Application.Receivers.Queries;
+using EnvelopeGenerator.Domain;
 using EnvelopeGenerator.Domain.Entities;
 
 namespace EnvelopeGenerator.Application.Interfaces.Services;
@@ -121,7 +122,7 @@ public interface IEnvelopeReceiverService : IBasicCRUDService<EnvelopeReceiverDt
     /// <param name="receiverQuery"></param>
     /// <param name="ignore_statuses"></param>
     /// <returns></returns>
-    Task<DataResult<IEnumerable<EnvelopeReceiverDto>>> ReadByUsernameAsync(string username, int? min_status = null, int? max_status = null, ReadEnvelopeQuery? envelopeQuery = null, ReadReceiverQuery? receiverQuery = null, params int[] ignore_statuses);
+    Task<DataResult<IEnumerable<EnvelopeReceiverDto>>> ReadByUsernameAsync(string username, Constants.EnvelopeStatus? min_status = null, Constants.EnvelopeStatus? max_status = null, ReadEnvelopeQuery? envelopeQuery = null, ReadReceiverQuery? receiverQuery = null, params Constants.EnvelopeStatus[] ignore_statuses);
 
     /// <summary>
     /// 

EnvelopeGenerator.Application/Interfaces/Services/IEnvelopeService.cs

@@ -1,6 +1,7 @@
 using DigitalData.Core.Abstraction.Application;
 using DigitalData.Core.Abstraction.Application.DTO;
 using EnvelopeGenerator.Application.Dto;
+using EnvelopeGenerator.Domain;
 using EnvelopeGenerator.Domain.Entities;
 
 namespace EnvelopeGenerator.Application.Interfaces.Services;
@@ -40,5 +41,5 @@ public interface IEnvelopeService : IBasicCRUDService<EnvelopeDto, Envelope, int
     /// <param name="max_status"></param>
     /// <param name="ignore_statuses"></param>
     /// <returns></returns>
-    Task<DataResult<IEnumerable<EnvelopeDto>>> ReadByUserAsync(int userId, int? min_status = null, int? max_status = null, params int[] ignore_statuses);
+    Task<DataResult<IEnumerable<EnvelopeDto>>> ReadByUserAsync(int userId, Constants.EnvelopeStatus? min_status = null, Constants.EnvelopeStatus? max_status = null, params Constants.EnvelopeStatus[] ignore_statuses);
 }

EnvelopeGenerator.Application/Services/EnvelopeReceiverService.cs

@@ -13,6 +13,8 @@ using EnvelopeGenerator.Application.Interfaces.Services;
 using EnvelopeGenerator.Application.Envelopes;
 using EnvelopeGenerator.Application.Envelopes.Queries;
 using EnvelopeGenerator.Application.Receivers.Queries;
+using System.Reflection.Metadata;
+using EnvelopeGenerator.Domain;
 
 namespace EnvelopeGenerator.Application.Services;
 
@@ -237,7 +239,7 @@ public class EnvelopeReceiverService : BasicCRUDService<IEnvelopeReceiverReposit
     /// <param name="receiverQuery"></param>
     /// <param name="ignore_statuses"></param>
     /// <returns></returns>
-    public async Task<DataResult<IEnumerable<EnvelopeReceiverDto>>> ReadByUsernameAsync(string username, int? min_status = null, int? max_status = null, ReadEnvelopeQuery? envelopeQuery = null, ReadReceiverQuery? receiverQuery = null, params int[] ignore_statuses)
+    public async Task<DataResult<IEnumerable<EnvelopeReceiverDto>>> ReadByUsernameAsync(string username, Constants.EnvelopeStatus? min_status = null, Constants.EnvelopeStatus? max_status = null, ReadEnvelopeQuery? envelopeQuery = null, ReadReceiverQuery? receiverQuery = null, params Constants.EnvelopeStatus[] ignore_statuses)
     {
         var er_list = await _repository.ReadByUsernameAsync(username: username, min_status: min_status, max_status: max_status, ignore_statuses: ignore_statuses);
         
@@ -247,7 +249,7 @@ public class EnvelopeReceiverService : BasicCRUDService<IEnvelopeReceiverReposit
         if (envelopeQuery?.Uuid is string uuid)
             er_list = er_list.Where(er => er.Envelope?.Uuid == uuid);
 
-        if (envelopeQuery?.StatusQ is int status)
+        if (envelopeQuery?.StatusQ?.Status?.FirstOrDefault() is Constants.EnvelopeStatus status)
             er_list = er_list.Where(er => er.Envelope?.Status == status);
 
         if(receiverQuery?.Id is int id)

EnvelopeGenerator.Application/Services/EnvelopeService.cs

@@ -5,6 +5,9 @@ using EnvelopeGenerator.Application.Interfaces.Services;
 using EnvelopeGenerator.Application.Dto;
 using EnvelopeGenerator.Domain.Entities;
 using EnvelopeGenerator.Application.Interfaces.Repositories;
+using EnvelopeGenerator.Application.Envelopes.Queries;
+using System.Reflection.Metadata;
+using EnvelopeGenerator.Domain;
 
 namespace EnvelopeGenerator.Application.Services;
 
@@ -67,7 +70,7 @@ public class EnvelopeService : BasicCRUDService<IEnvelopeRepository, EnvelopeDto
     /// <param name="max_status"></param>
     /// <param name="ignore_statuses"></param>
     /// <returns></returns>
-    public async Task<DataResult<IEnumerable<EnvelopeDto>>> ReadByUserAsync(int userId, int? min_status = null, int? max_status = null, params int[] ignore_statuses)
+    public async Task<DataResult<IEnumerable<EnvelopeDto>>> ReadByUserAsync(int userId, Constants.EnvelopeStatus? min_status = null, Constants.EnvelopeStatus? max_status = null, params Constants.EnvelopeStatus[] ignore_statuses)
     {
         var users = await _repository.ReadByUserAsync(userId: userId, min_status: min_status, max_status: max_status, ignore_statuses: ignore_statuses);            
         var readDto = _mapper.Map<IEnumerable<EnvelopeDto>>(users);

EnvelopeGenerator.Domain/Entities/Envelope.cs

@@ -22,7 +22,7 @@ public class Envelope
         // TODO: * Check the Form App and remove the default value
 #if NETFRAMEWORK
         Id = 0;
-        Status = (int)Constants.EnvelopeStatus.EnvelopeCreated;
+        Status = Constants.EnvelopeStatus.EnvelopeCreated;
         Uuid = Guid.NewGuid().ToString();
         Message = My.Resources.Envelope.Please_read_and_sign_this_document;
         Title= string.Empty;
@@ -153,7 +153,7 @@ public class Envelope
     public string CURRENT_WORK_APP { get; set; } = "signFLOW GUI";
 
     [NotMapped]
-    public bool IsAlreadySent => Status > (int)Constants.EnvelopeStatus.EnvelopeSaved;
+    public bool IsAlreadySent => Status > Constants.EnvelopeStatus.EnvelopeSaved;
 #endif
 
     public List<EnvelopeDocument> Documents { get; set; }

EnvelopeGenerator.Infrastructure/Repositories/EnvelopeRepository.cs

@@ -2,6 +2,7 @@
 using EnvelopeGenerator.Domain.Entities;
 using EnvelopeGenerator.Application.Interfaces.Repositories;
 using Microsoft.EntityFrameworkCore;
+using EnvelopeGenerator.Domain;
 
 namespace EnvelopeGenerator.Infrastructure.Repositories;
 
@@ -47,7 +48,7 @@ public class EnvelopeRepository : CRUDRepository<Envelope, int, EGDbContext>, IE
         return await query.FirstOrDefaultAsync();
     }
 
-    public async Task<IEnumerable<Envelope>> ReadByUserAsync(int userId, int? min_status = null, int? max_status = null, params int[] ignore_statuses)
+    public async Task<IEnumerable<Envelope>> ReadByUserAsync(int userId, Constants.EnvelopeStatus? min_status = null, Constants.EnvelopeStatus? max_status = null, params Constants.EnvelopeStatus[] ignore_statuses)
     {
         var query = _dbSet.AsNoTracking().Where(e => e.UserId == userId);
 

EnvelopeGenerator.Infrastructure/Repositories/EnvlopeReceiverRepository.cs

@@ -3,6 +3,7 @@ using EnvelopeGenerator.Domain.Entities;
 using EnvelopeGenerator.Application.Interfaces.Repositories;
 using Microsoft.EntityFrameworkCore;
 using EnvelopeGenerator.Application.Exceptions;
+using EnvelopeGenerator.Domain;
 
 namespace EnvelopeGenerator.Infrastructure.Repositories;
 
@@ -79,7 +80,7 @@ public class EnvelopeReceiverRepository : CRUDRepository<EnvelopeReceiver, (int
         .Select(er => er.AccessCode)
         .FirstOrDefaultAsync();
 
-    public async Task<IEnumerable<EnvelopeReceiver>> ReadByUsernameAsync(string username, int? min_status = null, int? max_status = null, params int[] ignore_statuses)
+    public async Task<IEnumerable<EnvelopeReceiver>> ReadByUsernameAsync(string username, Constants.EnvelopeStatus? min_status = null, Constants.EnvelopeStatus? max_status = null, params Constants.EnvelopeStatus[] ignore_statuses)
     {
         var query = _dbSet.AsNoTracking().Where(er => er.Envelope!.User!.Username == username);