Support composite keys for CrudAppService

framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Conventions/AbpServiceConvention.cs

@@ -12,6 +12,7 @@ using Volo.Abp.Application.Services;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.Http;
 using Volo.Abp.Http.Modeling;
+using Volo.Abp.Http.ProxyScripting.Generators;
 using Volo.Abp.Reflection;
 
 namespace Volo.Abp.AspNetCore.Mvc.Conventions
@@ -81,7 +82,7 @@ namespace Volo.Abp.AspNetCore.Mvc.Conventions
                         continue;
                     }
 
-                    if (!TypeHelper.IsPrimitiveExtended(prm.ParameterInfo.ParameterType))
+                    if (!TypeHelper.IsPrimitiveExtended(prm.ParameterInfo.ParameterType, includeEnums: true))
                     {
                         if (CanUseFormBodyBinding(action, prm))
                         {
@@ -94,7 +95,15 @@ namespace Volo.Abp.AspNetCore.Mvc.Conventions
 
         protected virtual bool CanUseFormBodyBinding(ActionModel action, ParameterModel parameter)
         {
-            if (_options.ConventionalControllers.FormBodyBindingIgnoredTypes.Any(t => t.IsAssignableFrom(parameter.ParameterInfo.ParameterType)))
+            //We want to use "id" as path parameter, not body!
+            if (parameter.ParameterName == "id")
+            {
+                return false;
+            }
+
+            if (_options.ConventionalControllers
+                .FormBodyBindingIgnoredTypes
+                .Any(t => t.IsAssignableFrom(parameter.ParameterInfo.ParameterType)))
             {
                 return false;
             }
@@ -251,7 +260,7 @@ namespace Volo.Abp.AspNetCore.Mvc.Conventions
 
                 if (!selector.ActionConstraints.OfType<HttpMethodActionConstraint>().Any())
                 {
-                    selector.ActionConstraints.Add(new HttpMethodActionConstraint(new[] {httpMethod}));
+                    selector.ActionConstraints.Add(new HttpMethodActionConstraint(new[] { httpMethod }));
                 }
             }
         }
@@ -295,9 +304,24 @@ namespace Volo.Abp.AspNetCore.Mvc.Conventions
             var url = $"api/{rootPath}/{controllerNameInUrl.ToCamelCase()}";
 
             //Add {id} path if needed
-            if (action.Parameters.Any(p => p.ParameterName == "id"))
+            var idParameterModel = action.Parameters.FirstOrDefault(p => p.ParameterName == "id");
+            if (idParameterModel != null)
             {
-                url += "/{id}";
+                if (TypeHelper.IsPrimitiveExtended(idParameterModel.ParameterType, includeEnums: true))
+                {
+                    url += "/{id}";
+                }
+                else
+                {
+                    var properties = idParameterModel
+                        .ParameterType
+                        .GetProperties(BindingFlags.Instance | BindingFlags.Public);
+
+                    foreach (var property in properties)
+                    {
+                        url += "/{" + property.Name + "}";
+                    }
+                }
             }
 
             //Add action name if needed
@@ -341,7 +365,7 @@ namespace Volo.Abp.AspNetCore.Mvc.Conventions
 
         protected virtual string NormalizeUrlControllerName(string rootPath, string controllerName, ActionModel action, string httpMethod, [CanBeNull] ConventionalControllerSetting configuration)
         {
-            if(configuration?.UrlControllerNameNormalizer == null)
+            if (configuration?.UrlControllerNameNormalizer == null)
             {
                 return controllerName;
             }
@@ -364,7 +388,7 @@ namespace Volo.Abp.AspNetCore.Mvc.Conventions
 
         protected virtual bool IsEmptySelector(SelectorModel selector)
         {
-            return selector.AttributeRouteModel == null 
+            return selector.AttributeRouteModel == null
                    && selector.ActionConstraints.IsNullOrEmpty()
                    && selector.EndpointMetadata.IsNullOrEmpty();
         }

framework/src/Volo.Abp.Ddd.Application.Contracts/Volo/Abp/Application/Services/ICrudAppService.cs

@@ -5,36 +5,30 @@ namespace Volo.Abp.Application.Services
 {
     public interface ICrudAppService<TEntityDto, in TKey>
         : ICrudAppService<TEntityDto, TKey, PagedAndSortedResultRequestDto>
-        where TEntityDto : IEntityDto<TKey>
     {
 
     }
 
     public interface ICrudAppService<TEntityDto, in TKey, in TGetListInput>
         : ICrudAppService<TEntityDto, TKey, TGetListInput, TEntityDto, TEntityDto>
-        where TEntityDto : IEntityDto<TKey>
     {
 
     }
 
     public interface ICrudAppService<TEntityDto, in TKey, in TGetListInput, in TCreateInput>
         : ICrudAppService<TEntityDto, TKey, TGetListInput, TCreateInput, TCreateInput>
-        where TEntityDto : IEntityDto<TKey>
     {
 
     }
 
     public interface ICrudAppService<TEntityDto, in TKey, in TGetListInput, in TCreateInput, in TUpdateInput>
         : ICrudAppService<TEntityDto, TEntityDto, TKey, TGetListInput, TCreateInput, TUpdateInput>
-        where TEntityDto : IEntityDto<TKey>
     {
 
     }
 
     public interface ICrudAppService<TGetOutputDto, TGetListOutputDto, in TKey, in TGetListInput, in TCreateInput, in TUpdateInput>
         : IApplicationService
-        where TGetOutputDto : IEntityDto<TKey>
-        where TGetListOutputDto : IEntityDto<TKey>
     {
         Task<TGetOutputDto> GetAsync(TKey id);
 

framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/AbstractKeyCrudAppService.cs

@@ -0,0 +1,341 @@
+using System;
+using System.Linq;
+using System.Linq.Dynamic.Core;
+using System.Threading.Tasks;
+using Volo.Abp.Application.Dtos;
+using Volo.Abp.Auditing;
+using Volo.Abp.Domain.Entities;
+using Volo.Abp.Domain.Repositories;
+using Volo.Abp.Linq;
+using Volo.Abp.MultiTenancy;
+using Volo.Abp.ObjectMapping;
+
+namespace Volo.Abp.Application.Services
+{
+    public abstract class AbstractKeyCrudAppService<TEntity, TEntityDto, TKey>
+        : AbstractKeyCrudAppService<TEntity, TEntityDto, TKey, PagedAndSortedResultRequestDto>
+        where TEntity : class, IEntity
+    {
+        protected AbstractKeyCrudAppService(IRepository<TEntity> repository)
+            : base(repository)
+        {
+
+        }
+    }
+
+    public abstract class AbstractKeyCrudAppService<TEntity, TEntityDto, TKey, TGetListInput>
+        : AbstractKeyCrudAppService<TEntity, TEntityDto, TKey, TGetListInput, TEntityDto, TEntityDto>
+        where TEntity : class, IEntity
+    {
+        protected AbstractKeyCrudAppService(IRepository<TEntity> repository)
+            : base(repository)
+        {
+
+        }
+    }
+
+    public abstract class AbstractKeyCrudAppService<TEntity, TEntityDto, TKey, TGetListInput, TCreateInput>
+        : AbstractKeyCrudAppService<TEntity, TEntityDto, TKey, TGetListInput, TCreateInput, TCreateInput>
+        where TEntity : class, IEntity
+    {
+        protected AbstractKeyCrudAppService(IRepository<TEntity> repository)
+            : base(repository)
+        {
+
+        }
+    }
+
+    public abstract class AbstractKeyCrudAppService<TEntity, TEntityDto, TKey, TGetListInput, TCreateInput, TUpdateInput>
+        : AbstractKeyCrudAppService<TEntity, TEntityDto, TEntityDto, TKey, TGetListInput, TCreateInput, TUpdateInput>
+        where TEntity : class, IEntity
+    {
+        protected AbstractKeyCrudAppService(IRepository<TEntity> repository)
+            : base(repository)
+        {
+
+        }
+
+        protected override TEntityDto MapToGetListOutputDto(TEntity entity)
+        {
+            return MapToGetOutputDto(entity);
+        }
+    }
+
+    public abstract class AbstractKeyCrudAppService<TEntity, TGetOutputDto, TGetListOutputDto, TKey, TGetListInput, TCreateInput, TUpdateInput>
+        : ApplicationService,
+            ICrudAppService<TGetOutputDto, TGetListOutputDto, TKey, TGetListInput, TCreateInput, TUpdateInput>
+        where TEntity : class, IEntity
+    {
+        public IAsyncQueryableExecuter AsyncQueryableExecuter { get; set; }
+
+        protected IRepository<TEntity> Repository { get; }
+
+        protected virtual string GetPolicyName { get; set; }
+
+        protected virtual string GetListPolicyName { get; set; }
+
+        protected virtual string CreatePolicyName { get; set; }
+
+        protected virtual string UpdatePolicyName { get; set; }
+
+        protected virtual string DeletePolicyName { get; set; }
+
+        protected AbstractKeyCrudAppService(IRepository<TEntity> repository)
+        {
+            Repository = repository;
+            AsyncQueryableExecuter = DefaultAsyncQueryableExecuter.Instance;
+        }
+
+        public virtual async Task<TGetOutputDto> GetAsync(TKey id)
+        {
+            await CheckGetPolicyAsync();
+
+            var entity = await GetEntityByIdAsync(id);
+            return MapToGetOutputDto(entity);
+        }
+
+        public virtual async Task<PagedResultDto<TGetListOutputDto>> GetListAsync(TGetListInput input)
+        {
+            await CheckGetListPolicyAsync();
+
+            var query = CreateFilteredQuery(input);
+
+            var totalCount = await AsyncQueryableExecuter.CountAsync(query);
+
+            query = ApplySorting(query, input);
+            query = ApplyPaging(query, input);
+
+            var entities = await AsyncQueryableExecuter.ToListAsync(query);
+
+            return new PagedResultDto<TGetListOutputDto>(
+                totalCount,
+                entities.Select(MapToGetListOutputDto).ToList()
+            );
+        }
+
+        public virtual async Task<TGetOutputDto> CreateAsync(TCreateInput input)
+        {
+            await CheckCreatePolicyAsync();
+
+            var entity = MapToEntity(input);
+
+            TryToSetTenantId(entity);
+
+            await Repository.InsertAsync(entity, autoSave: true);
+
+            return MapToGetOutputDto(entity);
+        }
+
+        public virtual async Task<TGetOutputDto> UpdateAsync(TKey id, TUpdateInput input)
+        {
+            await CheckUpdatePolicyAsync();
+
+            var entity = await GetEntityByIdAsync(id);
+            //TODO: Check if input has id different than given id and normalize if it's default value, throw ex otherwise
+            MapToEntity(input, entity);
+            await Repository.UpdateAsync(entity, autoSave: true);
+
+            return MapToGetOutputDto(entity);
+        }
+
+        public virtual async Task DeleteAsync(TKey id)
+        {
+            await CheckDeletePolicyAsync();
+
+            await DeleteByIdAsync(id);
+        }
+
+        protected abstract Task DeleteByIdAsync(TKey id);
+
+        protected abstract Task<TEntity> GetEntityByIdAsync(TKey id);
+
+        protected virtual async Task CheckGetPolicyAsync()
+        {
+            await CheckPolicyAsync(GetPolicyName);
+        }
+
+        protected virtual async Task CheckGetListPolicyAsync()
+        {
+            await CheckPolicyAsync(GetListPolicyName);
+        }
+
+        protected virtual async Task CheckCreatePolicyAsync()
+        {
+            await CheckPolicyAsync(CreatePolicyName);
+        }
+
+        protected virtual async Task CheckUpdatePolicyAsync()
+        {
+            await CheckPolicyAsync(UpdatePolicyName);
+        }
+
+        protected virtual async Task CheckDeletePolicyAsync()
+        {
+            await CheckPolicyAsync(DeletePolicyName);
+        }
+
+        /// <summary>
+        /// Should apply sorting if needed.
+        /// </summary>
+        /// <param name="query">The query.</param>
+        /// <param name="input">The input.</param>
+        protected virtual IQueryable<TEntity> ApplySorting(IQueryable<TEntity> query, TGetListInput input)
+        {
+            //Try to sort query if available
+            if (input is ISortedResultRequest sortInput)
+            {
+                if (!sortInput.Sorting.IsNullOrWhiteSpace())
+                {
+                    return query.OrderBy(sortInput.Sorting);
+                }
+            }
+
+            //IQueryable.Task requires sorting, so we should sort if Take will be used.
+            if (input is ILimitedResultRequest)
+            {
+                return ApplyDefaultSorting(query);
+            }
+
+            //No sorting
+            return query;
+        }
+
+        /// <summary>
+        /// Applies sorting if no sorting specified but a limited result requested.
+        /// </summary>
+        /// <param name="query">The query.</param>
+        protected virtual IQueryable<TEntity> ApplyDefaultSorting(IQueryable<TEntity> query)
+        {
+            if (typeof(TEntity).IsAssignableTo<ICreationAuditedObject>())
+            {
+                return query.OrderByDescending(e => ((ICreationAuditedObject)e).CreationTime);
+            }
+
+            throw new AbpException("No sorting specified but this query requires sorting. Override the ApplyDefaultSorting method for your application service derived from AbstractKeyCrudAppService!");
+        }
+
+        /// <summary>
+        /// Should apply paging if needed.
+        /// </summary>
+        /// <param name="query">The query.</param>
+        /// <param name="input">The input.</param>
+        protected virtual IQueryable<TEntity> ApplyPaging(IQueryable<TEntity> query, TGetListInput input)
+        {
+            //Try to use paging if available
+            if (input is IPagedResultRequest pagedInput)
+            {
+                return query.PageBy(pagedInput);
+            }
+
+            //Try to limit query result if available
+            if (input is ILimitedResultRequest limitedInput)
+            {
+                return query.Take(limitedInput.MaxResultCount);
+            }
+
+            //No paging
+            return query;
+        }
+
+        /// <summary>
+        /// This method should create <see cref="IQueryable{TEntity}"/> based on given input.
+        /// It should filter query if needed, but should not do sorting or paging.
+        /// Sorting should be done in <see cref="ApplySorting"/> and paging should be done in <see cref="ApplyPaging"/>
+        /// methods.
+        /// </summary>
+        /// <param name="input">The input.</param>
+        protected virtual IQueryable<TEntity> CreateFilteredQuery(TGetListInput input)
+        {
+            return Repository;
+        }
+
+        /// <summary>
+        /// Maps <see cref="TEntity"/> to <see cref="TGetOutputDto"/>.
+        /// It uses <see cref="IObjectMapper"/> by default.
+        /// It can be overriden for custom mapping.
+        /// </summary>
+        protected virtual TGetOutputDto MapToGetOutputDto(TEntity entity)
+        {
+            return ObjectMapper.Map<TEntity, TGetOutputDto>(entity);
+        }
+
+        /// <summary>
+        /// Maps <see cref="TEntity"/> to <see cref="TGetListOutputDto"/>.
+        /// It uses <see cref="IObjectMapper"/> by default.
+        /// It can be overriden for custom mapping.
+        /// </summary>
+        protected virtual TGetListOutputDto MapToGetListOutputDto(TEntity entity)
+        {
+            return ObjectMapper.Map<TEntity, TGetListOutputDto>(entity);
+        }
+
+        /// <summary>
+        /// Maps <see cref="TCreateInput"/> to <see cref="TEntity"/> to create a new entity.
+        /// It uses <see cref="IObjectMapper"/> by default.
+        /// It can be overriden for custom mapping.
+        /// </summary>
+        protected virtual TEntity MapToEntity(TCreateInput createInput)
+        {
+            var entity = ObjectMapper.Map<TCreateInput, TEntity>(createInput);
+            SetIdForGuids(entity);
+            return entity;
+        }
+
+        /// <summary>
+        /// Sets Id value for the entity if <see cref="TKey"/> is <see cref="Guid"/>.
+        /// It's used while creating a new entity.
+        /// </summary>
+        protected virtual void SetIdForGuids(TEntity entity)
+        {
+            var entityWithGuidId = entity as IEntity<Guid>;
+
+            if (entityWithGuidId == null || entityWithGuidId.Id != Guid.Empty)
+            {
+                return;
+            }
+
+            EntityHelper.TrySetId(
+                entityWithGuidId,
+                () => GuidGenerator.Create(),
+                true
+            );
+        }
+
+        /// <summary>
+        /// Maps <see cref="TUpdateInput"/> to <see cref="TEntity"/> to update the entity.
+        /// It uses <see cref="IObjectMapper"/> by default.
+        /// It can be overriden for custom mapping.
+        /// </summary>
+        protected virtual void MapToEntity(TUpdateInput updateInput, TEntity entity)
+        {
+            ObjectMapper.Map(updateInput, entity);
+        }
+
+        protected virtual void TryToSetTenantId(TEntity entity)
+        {
+            if (entity is IMultiTenant && HasTenantIdProperty(entity))
+            {
+                var tenantId = CurrentTenant.Id;
+
+                if (!tenantId.HasValue)
+                {
+                    return;
+                }
+
+                var propertyInfo = entity.GetType().GetProperty(nameof(IMultiTenant.TenantId));
+
+                if (propertyInfo == null || propertyInfo.GetSetMethod(true) == null)
+                {
+                    return;
+                }
+
+                propertyInfo.SetValue(entity, tenantId);
+            }
+        }
+
+        protected virtual bool HasTenantIdProperty(TEntity entity)
+        {
+            return entity.GetType().GetProperty(nameof(IMultiTenant.TenantId)) != null;
+        }
+    }
+}

framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/CrudAppService.cs

@@ -1,13 +1,10 @@
 using System;
 using System.Linq;
-using System.Linq.Dynamic.Core;
 using System.Threading.Tasks;
 using Volo.Abp.Application.Dtos;
+using Volo.Abp.Auditing;
 using Volo.Abp.Domain.Entities;
 using Volo.Abp.Domain.Repositories;
-using Volo.Abp.Linq;
-using Volo.Abp.MultiTenancy;
-using Volo.Abp.ObjectMapping;
 
 namespace Volo.Abp.Application.Services
 {
@@ -65,274 +62,49 @@ namespace Volo.Abp.Application.Services
     }
 
     public abstract class CrudAppService<TEntity, TGetOutputDto, TGetListOutputDto, TKey, TGetListInput, TCreateInput, TUpdateInput>
-       : ApplicationService,
+        : AbstractKeyCrudAppService<TEntity, TGetOutputDto, TGetListOutputDto, TKey, TGetListInput, TCreateInput, TUpdateInput>
-        ICrudAppService<TGetOutputDto, TGetListOutputDto, TKey, TGetListInput, TCreateInput, TUpdateInput>
+        where TEntity : class, IEntity<TKey>
-           where TEntity : class, IEntity<TKey>
         where TGetOutputDto : IEntityDto<TKey>
         where TGetListOutputDto : IEntityDto<TKey>
     {
-        public IAsyncQueryableExecuter AsyncQueryableExecuter { get; set; }
+        protected new IRepository<TEntity, TKey> Repository { get; }
-
-        protected IRepository<TEntity, TKey> Repository { get; }
-
-        protected virtual string GetPolicyName { get; set; }
-
-        protected virtual string GetListPolicyName { get; set; }
-
-        protected virtual string CreatePolicyName { get; set; }
-
-        protected virtual string UpdatePolicyName { get; set; }
-
-        protected virtual string DeletePolicyName { get; set; }
 
         protected CrudAppService(IRepository<TEntity, TKey> repository)
+        : base(repository)
         {
             Repository = repository;
-            AsyncQueryableExecuter = DefaultAsyncQueryableExecuter.Instance;
         }
 
-        public virtual async Task<TGetOutputDto> GetAsync(TKey id)
+        protected override async Task DeleteByIdAsync(TKey id)
         {
-            await CheckGetPolicyAsync();
-
-            var entity = await GetEntityByIdAsync(id);
-            return MapToGetOutputDto(entity);
-        }
-
-        public virtual async Task<PagedResultDto<TGetListOutputDto>> GetListAsync(TGetListInput input)
-        {
-            await CheckGetListPolicyAsync();
-
-            var query = CreateFilteredQuery(input);
-
-            var totalCount = await AsyncQueryableExecuter.CountAsync(query);
-
-            query = ApplySorting(query, input);
-            query = ApplyPaging(query, input);
-
-            var entities = await AsyncQueryableExecuter.ToListAsync(query);
-
-            return new PagedResultDto<TGetListOutputDto>(
-                totalCount,
-                entities.Select(MapToGetListOutputDto).ToList()
-            );
-        }
-
-        public virtual async Task<TGetOutputDto> CreateAsync(TCreateInput input)
-        {
-            await CheckCreatePolicyAsync();
-
-            var entity = MapToEntity(input);
-
-            TryToSetTenantId(entity);
-
-            await Repository.InsertAsync(entity, autoSave: true);
-
-            return MapToGetOutputDto(entity);
-        }
-
-        public virtual async Task<TGetOutputDto> UpdateAsync(TKey id, TUpdateInput input)
-        {
-            await CheckUpdatePolicyAsync();
-
-            var entity = await GetEntityByIdAsync(id);
-            //TODO: Check if input has id different than given id and normalize if it's default value, throw ex otherwise
-            MapToEntity(input, entity);
-            await Repository.UpdateAsync(entity, autoSave: true);
-
-            return MapToGetOutputDto(entity);
-        }
-
-        public virtual async Task DeleteAsync(TKey id)
-        {
-            await CheckDeletePolicyAsync();
-
             await Repository.DeleteAsync(id);
         }
 
-        protected virtual Task<TEntity> GetEntityByIdAsync(TKey id)
+        protected override async Task<TEntity> GetEntityByIdAsync(TKey id)
-        {
-            return Repository.GetAsync(id);
-        }
-
-        protected virtual async Task CheckGetPolicyAsync()
-        {
-            await CheckPolicyAsync(GetPolicyName);
-        }
-
-        protected virtual async Task CheckGetListPolicyAsync()
-        {
-            await CheckPolicyAsync(GetListPolicyName);
-        }
-
-        protected virtual async Task CheckCreatePolicyAsync()
-        {
-            await CheckPolicyAsync(CreatePolicyName);
-        }
-
-        protected virtual async Task CheckUpdatePolicyAsync()
-        {
-            await CheckPolicyAsync(UpdatePolicyName);
-        }
-
-        protected virtual async Task CheckDeletePolicyAsync()
         {
-            await CheckPolicyAsync(DeletePolicyName);
+            return await Repository.GetAsync(id);
         }
 
-        /// <summary>
+        protected override void MapToEntity(TUpdateInput updateInput, TEntity entity)
-        /// Should apply sorting if needed.
-        /// </summary>
-        /// <param name="query">The query.</param>
-        /// <param name="input">The input.</param>
-        protected virtual IQueryable<TEntity> ApplySorting(IQueryable<TEntity> query, TGetListInput input)
-        {
-            //Try to sort query if available
-            if (input is ISortedResultRequest sortInput)
-            {
-                if (!sortInput.Sorting.IsNullOrWhiteSpace())
-                {
-                    return query.OrderBy(sortInput.Sorting);
-                }
-            }
-
-            //IQueryable.Task requires sorting, so we should sort if Take will be used.
-            if (input is ILimitedResultRequest)
-            {
-                return query.OrderByDescending(e => e.Id);
-            }
-
-            //No sorting
-            return query;
-        }
-
-        /// <summary>
-        /// Should apply paging if needed.
-        /// </summary>
-        /// <param name="query">The query.</param>
-        /// <param name="input">The input.</param>
-        protected virtual IQueryable<TEntity> ApplyPaging(IQueryable<TEntity> query, TGetListInput input)
-        {
-            //Try to use paging if available
-            if (input is IPagedResultRequest pagedInput)
-            {
-                return query.PageBy(pagedInput);
-            }
-
-            //Try to limit query result if available
-            if (input is ILimitedResultRequest limitedInput)
-            {
-                return query.Take(limitedInput.MaxResultCount);
-            }
-
-            //No paging
-            return query;
-        }
-
-        /// <summary>
-        /// This method should create <see cref="IQueryable{TEntity}"/> based on given input.
-        /// It should filter query if needed, but should not do sorting or paging.
-        /// Sorting should be done in <see cref="ApplySorting"/> and paging should be done in <see cref="ApplyPaging"/>
-        /// methods.
-        /// </summary>
-        /// <param name="input">The input.</param>
-        protected virtual IQueryable<TEntity> CreateFilteredQuery(TGetListInput input)
-        {
-            return Repository;
-        }
-
-        /// <summary>
-        /// Maps <see cref="TEntity"/> to <see cref="TGetOutputDto"/>.
-        /// It uses <see cref="IObjectMapper"/> by default.
-        /// It can be overriden for custom mapping.
-        /// </summary>
-        protected virtual TGetOutputDto MapToGetOutputDto(TEntity entity)
-        {
-            return ObjectMapper.Map<TEntity, TGetOutputDto>(entity);
-        }
-
-        /// <summary>
-        /// Maps <see cref="TEntity"/> to <see cref="TGetListOutputDto"/>.
-        /// It uses <see cref="IObjectMapper"/> by default.
-        /// It can be overriden for custom mapping.
-        /// </summary>
-        protected virtual TGetListOutputDto MapToGetListOutputDto(TEntity entity)
-        {
-            return ObjectMapper.Map<TEntity, TGetListOutputDto>(entity);
-        }
-
-        /// <summary>
-        /// Maps <see cref="TCreateInput"/> to <see cref="TEntity"/> to create a new entity.
-        /// It uses <see cref="IObjectMapper"/> by default.
-        /// It can be overriden for custom mapping.
-        /// </summary>
-        protected virtual TEntity MapToEntity(TCreateInput createInput)
-        {
-            var entity = ObjectMapper.Map<TCreateInput, TEntity>(createInput);
-            SetIdForGuids(entity);
-            return entity;
-        }
-
-        /// <summary>
-        /// Sets Id value for the entity if <see cref="TKey"/> is <see cref="Guid"/>.
-        /// It's used while creating a new entity.
-        /// </summary>
-        protected virtual void SetIdForGuids(TEntity entity)
-        {
-            var entityWithGuidId = entity as IEntity<Guid>;
-
-            if (entityWithGuidId == null || entityWithGuidId.Id != Guid.Empty)
-            {
-                return;
-            }
-
-            EntityHelper.TrySetId(
-                entityWithGuidId,
-                () => GuidGenerator.Create(),
-                true
-            );
-        }
-
-        /// <summary>
-        /// Maps <see cref="TUpdateInput"/> to <see cref="TEntity"/> to update the entity.
-        /// It uses <see cref="IObjectMapper"/> by default.
-        /// It can be overriden for custom mapping.
-        /// </summary>
-        protected virtual void MapToEntity(TUpdateInput updateInput, TEntity entity)
         {
             if (updateInput is IEntityDto<TKey> entityDto)
             {
                 entityDto.Id = entity.Id;
             }
 
-            ObjectMapper.Map(updateInput, entity);
+            base.MapToEntity(updateInput, entity);
         }
 
-        protected virtual void TryToSetTenantId(TEntity entity)
+        protected override IQueryable<TEntity> ApplyDefaultSorting(IQueryable<TEntity> query)
         {
-            if (entity is IMultiTenant && HasTenantIdProperty(entity))
+            if (typeof(TEntity).IsAssignableTo<ICreationAuditedObject>())
             {
-                var tenantId = CurrentTenant.Id;
+                return query.OrderByDescending(e => ((ICreationAuditedObject)e).CreationTime);
-
+            }
-                if (!tenantId.HasValue)
+            else
-                {
+            {
-                    return;
+                return query.OrderByDescending(e => e.Id);
-                }
-
-                var propertyInfo = entity.GetType().GetProperty(nameof(IMultiTenant.TenantId));
-
-                if (propertyInfo == null || propertyInfo.GetSetMethod(true) == null)
-                {
-                    return;
-                }
-
-                propertyInfo.SetValue(entity, tenantId);
             }
-        }
-
-        protected virtual bool HasTenantIdProperty(TEntity entity)
-        {
-            return entity.GetType().GetProperty(nameof(IMultiTenant.TenantId)) != null;
         }
     }
 }

framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/EntityNotFoundException.cs

@@ -47,7 +47,11 @@ namespace Volo.Abp.Domain.Entities
         /// Creates a new <see cref="EntityNotFoundException"/> object.
         /// </summary>
         public EntityNotFoundException(Type entityType, object id, Exception innerException)
-            : base($"There is no such an entity. Entity type: {entityType.FullName}, id: {id}", innerException)
+            : base(
+                id == null
+                    ? $"There is no such an entity given given id. Entity type: {entityType.FullName}"
+                    : $"There is no such an entity. Entity type: {entityType.FullName}, id: {id}",
+                innerException)
         {
             EntityType = entityType;
             Id = id;

framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Application/DistrictAppService.cs

@@ -0,0 +1,30 @@
+using System.Linq;
+using System.Threading.Tasks;
+using Volo.Abp.TestApp.Domain;
+using Volo.Abp.Application.Services;
+using Volo.Abp.Domain.Repositories;
+using Volo.Abp.TestApp.Application.Dto;
+
+namespace Volo.Abp.TestApp.Application
+{
+    //This is especially used to test the AbstractKeyCrudAppService
+    public class DistrictAppService : AbstractKeyCrudAppService<District, DistrictDto, DistrictKey>
+    {
+        public DistrictAppService(IRepository<District> repository) 
+            : base(repository)
+        {
+        }
+
+        protected override async Task DeleteByIdAsync(DistrictKey id)
+        {
+            await Repository.DeleteAsync(d => d.CityId == id.CityId && d.Name == id.Name);
+        }
+
+        protected override async Task<District> GetEntityByIdAsync(DistrictKey id)
+        {
+            return await AsyncQueryableExecuter.FirstOrDefaultAsync(
+                Repository.Where(d => d.CityId == id.CityId && d.Name == id.Name)
+            );
+        }
+    }
+}

framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Application/DistrictKey.cs

@@ -0,0 +1,11 @@
+using System;
+
+namespace Volo.Abp.TestApp.Application
+{
+    public class DistrictKey
+    {
+        public Guid CityId { get; set; }
+
+        public string Name { get; set; }
+    }
+}

framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Application/Dto/DistrictDto.cs

@@ -0,0 +1,14 @@
+using System;
+using Volo.Abp.Application.Dtos;
+
+namespace Volo.Abp.TestApp.Application.Dto
+{
+    public class DistrictDto : EntityDto
+    {
+        public Guid CityId { get; set; }
+
+        public string Name { get; set; }
+
+        public int Population { get; set; }
+    }
+}