style(EntityResourceService)

Author: jaredcnance

src/JsonApiDotNetCore/Services/EntityResourceService.cs

@@ -9,7 +9,7 @@
 
 namespace JsonApiDotNetCore.Services
 {
-    public class EntityResourceService<TResource> : EntityResourceService<TResource, int>, 
+    public class EntityResourceService<TResource> : EntityResourceService<TResource, int>,
         IResourceService<TResource>
         where TResource : class, IIdentifiable<int>
     {
@@ -21,7 +21,7 @@ public EntityResourceService(
         { }
     }
 
-    public class EntityResourceService<TResource, TId> : EntityResourceService<TResource, TResource, TId>, 
+    public class EntityResourceService<TResource, TId> : EntityResourceService<TResource, TResource, TId>,
         IResourceService<TResource, TId>
         where TResource : class, IIdentifiable<TId>
     {
@@ -33,7 +33,7 @@ public EntityResourceService(
         { }
     }
 
-    public class EntityResourceService<TResource, TEntity, TId> : 
+    public class EntityResourceService<TResource, TEntity, TId> :
         IResourceService<TResource, TId>
         where TResource : class, IIdentifiable<TId>
         where TEntity : class, IIdentifiable<TId>
@@ -51,8 +51,7 @@ public EntityResourceService(
             // no mapper provided, TResource & TEntity must be the same type
             if (typeof(TResource) != typeof(TEntity))
             {
-                throw new InvalidOperationException("Resource and Entity types are NOT the same. " +
-                    "Please provide a mapper.");
+                throw new InvalidOperationException("Resource and Entity types are NOT the same. Please provide a mapper.");
             }
 
             _jsonApiContext = jsonApiContext;
@@ -74,11 +73,11 @@ public EntityResourceService(
 
         public virtual async Task<TResource> CreateAsync(TResource resource)
         {
-            var entity = (typeof(TResource) == typeof(TEntity)) ? resource as TEntity : 
-                _mapper.Map<TEntity>(resource);
+            var entity = MapIn(resource);
+
             entity = await _entities.CreateAsync(entity);
-            return (typeof(TResource) == typeof(TEntity)) ? entity as TResource : 
-                _mapper.Map<TResource>(entity);
+
+            return MapOut(entity);
         }
 
         public virtual async Task<bool> DeleteAsync(TId id)
@@ -105,16 +104,12 @@ public virtual async Task<IEnumerable<TResource>> GetAsync()
 
         public virtual async Task<TResource> GetAsync(TId id)
         {
-            TResource dto;
             if (ShouldIncludeRelationships())
-                dto = await GetWithRelationshipsAsync(id);
-            else
-            {
-                TEntity entity = await _entities.GetAsync(id);
-                dto = (typeof(TResource) == typeof(TEntity)) ? entity as TResource : 
-                    _mapper.Map<TResource>(entity);
-            }
-            return dto;
+                return await GetWithRelationshipsAsync(id);
+
+            TEntity entity = await _entities.GetAsync(id);
+
+            return MapOut(entity);
         }
 
         public virtual async Task<object> GetRelationshipsAsync(TId id, string relationshipName)
@@ -145,15 +140,14 @@ public virtual async Task<object> GetRelationshipAsync(TId id, string relationsh
 
         public virtual async Task<TResource> UpdateAsync(TId id, TResource resource)
         {
-            var entity = (typeof(TResource) == typeof(TEntity)) ? resource as TEntity : 
-                _mapper.Map<TEntity>(resource);
+            var entity = MapIn(resource);
+
             entity = await _entities.UpdateAsync(id, entity);
-            return (typeof(TResource) == typeof(TEntity)) ? entity as TResource : 
-                _mapper.Map<TResource>(entity);
+
+            return MapOut(entity);
         }
 
-        public virtual async Task UpdateRelationshipsAsync(TId id, string relationshipName, 
-            List<DocumentData> relationships)
+        public virtual async Task UpdateRelationshipsAsync(TId id, string relationshipName, List<DocumentData> relationships)
         {
             var entity = await _entities.GetAndIncludeAsync(id, relationshipName);
             if (entity == null)
@@ -165,6 +159,7 @@ public virtual async Task UpdateRelationshipsAsync(TId id, string relationshipNa
                 .GetContextEntity(typeof(TResource))
                 .Relationships
                 .FirstOrDefault(r => r.Is(relationshipName));
+
             var relationshipType = relationship.Type;
 
             // update relationship type with internalname
@@ -174,8 +169,10 @@ public virtual async Task UpdateRelationshipsAsync(TId id, string relationshipNa
                 throw new JsonApiException(404, $"Property {relationship.InternalRelationshipName} " +
                     $"could not be found on entity.");
             }
-            relationship.Type = relationship.IsHasMany ? entityProperty.PropertyType.GetGenericArguments()[0] : 
-                entityProperty.PropertyType;
+
+            relationship.Type = relationship.IsHasMany
+                ? entityProperty.PropertyType.GetGenericArguments()[0]
+                : entityProperty.PropertyType;
 
             var relationshipIds = relationships.Select(r => r?.Id?.ToString());
 
@@ -200,10 +197,9 @@ protected virtual async Task<IEnumerable<TResource>> ApplyPageQueryAsync(IQuerya
                     $"with {pageManager.PageSize} entities");
             }
 
-            var pagedEntities = await _entities.PageAsync(entities, pageManager.PageSize,
-                pageManager.CurrentPage);
-            return (typeof(TResource) == typeof(TEntity)) ? pagedEntities as IEnumerable<TResource> :
-                _mapper.Map<IEnumerable<TResource>>(pagedEntities);
+            var pagedEntities = await _entities.PageAsync(entities, pageManager.PageSize, pageManager.CurrentPage);
+
+            return MapOut(pagedEntities);
         }
 
         protected virtual IQueryable<TEntity> ApplySortAndFilterQuery(IQueryable<TEntity> entities)
@@ -223,8 +219,7 @@ protected virtual IQueryable<TEntity> ApplySortAndFilterQuery(IQueryable<TEntity
             return entities;
         }
 
-        protected virtual IQueryable<TEntity> IncludeRelationships(IQueryable<TEntity> entities, 
-            List<string> relationships)
+        protected virtual IQueryable<TEntity> IncludeRelationships(IQueryable<TEntity> entities, List<string> relationships)
         {
             _jsonApiContext.IncludedRelationships = relationships;
 
@@ -237,22 +232,34 @@ protected virtual IQueryable<TEntity> IncludeRelationships(IQueryable<TEntity> e
         private async Task<TResource> GetWithRelationshipsAsync(TId id)
         {
             var query = _entities.Get().Where(e => e.Id.Equals(id));
+
             _jsonApiContext.QuerySet.IncludedRelationships.ForEach(r =>
             {
                 query = _entities.Include(query, r);
             });
+
             var value = await _entities.FirstOrDefaultAsync(query);
-            return (typeof(TResource) == typeof(TEntity)) ? value as TResource : 
-                _mapper.Map<TResource>(value);
+
+            return MapOut(value);
         }
 
         private bool ShouldIncludeRelationships()
-            => (_jsonApiContext.QuerySet?.IncludedRelationships != null && 
+            => (_jsonApiContext.QuerySet?.IncludedRelationships != null &&
             _jsonApiContext.QuerySet.IncludedRelationships.Count > 0);
 
         private TResource MapOut(TEntity entity)
             => (typeof(TResource) == typeof(TEntity))
                 ? entity as TResource :
                 _mapper.Map<TResource>(entity);
+
+        private IEnumerable<TResource> MapOut(IEnumerable<TEntity> entities)
+            => (typeof(TResource) == typeof(TEntity))
+                ? entities as IEnumerable<TResource>
+                : _mapper.Map<IEnumerable<TResource>>(entities);
+
+        private TEntity MapIn(TResource resource)
+            => (typeof(TResource) == typeof(TEntity))
+                ? resource as TEntity
+                : _mapper.Map<TEntity>(resource);
     }
 }