Merge pull request #116 from Research-Institute/develop

Develop
json-api-dotnet · May 27, 2017 · 0077cc1 · 0077cc1
2 parents 748ce06 + 5919517
commit 0077cc1
Show file tree

Hide file tree

Showing 14 changed files with 324 additions and 36 deletions.
diff --git a/docs/EntityRepositories.md b/docs/EntityRepositories.md
@@ -24,16 +24,14 @@ A sample implementation that performs data authorization might look like:
 public class MyAuthorizedEntityRepository : DefaultEntityRepository<MyEntity>
 {
     private readonly ILogger _logger;
-    private readonly AppDbContext _context;
     private readonly IAuthenticationService _authenticationService;
 
-    public MyAuthorizedEntityRepository(AppDbContext context,
+    public MyAuthorizedEntityRepository(
         ILoggerFactory loggerFactory,
         IJsonApiContext jsonApiContext,
         IAuthenticationService authenticationService)
-    : base(context, loggerFactory, jsonApiContext)
-    { 
-        _context = context;
+    : base(loggerFactory, jsonApiContext)
+    {
         _logger = loggerFactory.CreateLogger<MyEntityRepository>();
         _authenticationService = authenticationService;
     }

diff --git a/src/JsonApiDotNetCore/Data/DbContextResolver.cs b/src/JsonApiDotNetCore/Data/DbContextResolver.cs
@@ -0,0 +1,21 @@
+using System;
+using JsonApiDotNetCore.Extensions;
+using Microsoft.EntityFrameworkCore;
+
+namespace JsonApiDotNetCore.Data
+{
+    public class DbContextResolver : IDbContextResolver
+    {
+        private readonly DbContext _context;
+
+        public DbContextResolver(DbContext context)
+        {
+            _context = context;
+        }
+
+        public DbContext GetContext() => _context;
+
+        public DbSet<TEntity> GetDbSet<TEntity>() where TEntity : class
+            => _context.GetDbSet<TEntity>();
+    }
+}
diff --git a/src/JsonApiDotNetCore/Data/DefaultEntityRepository.cs b/src/JsonApiDotNetCore/Data/DefaultEntityRepository.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
@@ -17,12 +18,19 @@ public class DefaultEntityRepository<TEntity>
         IEntityRepository<TEntity> 
         where TEntity : class, IIdentifiable<int>
     {
+        [Obsolete("DbContext is no longer directly injected into the ctor. Use JsonApiContext.GetDbContextResolver() instead")]
         public DefaultEntityRepository(
             DbContext context,
             ILoggerFactory loggerFactory,
             IJsonApiContext jsonApiContext)
         : base(context, loggerFactory, jsonApiContext)
         { }
+
+        public DefaultEntityRepository(
+            ILoggerFactory loggerFactory,
+            IJsonApiContext jsonApiContext)
+        : base(loggerFactory, jsonApiContext)
+        { }
     }
 
     public class DefaultEntityRepository<TEntity, TId> 
@@ -35,6 +43,7 @@ public class DefaultEntityRepository<TEntity, TId>
         private readonly IJsonApiContext _jsonApiContext;
         private readonly IGenericProcessorFactory _genericProcessorFactory;
 
+        [Obsolete("DbContext is no longer directly injected into the ctor. Use JsonApiContext.GetDbContextResolver() instead")]
         public DefaultEntityRepository(
             DbContext context,
             ILoggerFactory loggerFactory,
@@ -47,6 +56,18 @@ public DefaultEntityRepository(
             _genericProcessorFactory = _jsonApiContext.GenericProcessorFactory;
         }
 
+        public DefaultEntityRepository(
+            ILoggerFactory loggerFactory,
+            IJsonApiContext jsonApiContext)
+        {
+            var contextResolver = jsonApiContext.GetDbContextResolver();
+            _context = contextResolver.GetContext();
+            _dbSet = contextResolver.GetDbSet<TEntity>();
+            _jsonApiContext = jsonApiContext;
+            _logger = loggerFactory.CreateLogger<DefaultEntityRepository<TEntity, TId>>();
+            _genericProcessorFactory = _jsonApiContext.GenericProcessorFactory;
+        }
+
         public virtual IQueryable<TEntity> Get()
         {
             if(_jsonApiContext.QuerySet?.Fields != null && _jsonApiContext.QuerySet.Fields.Any())
@@ -111,10 +132,8 @@ public virtual async Task<TEntity> UpdateAsync(TId id, TEntity entity)
             if (oldEntity == null)
                 return null;
 
-            _jsonApiContext.RequestEntity.Attributes.ForEach(attr =>
-            {
-                attr.SetValue(oldEntity, attr.GetValue(entity));
-            });
+            foreach(var attr in _jsonApiContext.AttributesToUpdate)
+                attr.Key.SetValue(oldEntity, attr.Value);
 
             foreach(var relationship in _jsonApiContext.RelationshipsToUpdate)
                 relationship.Key.SetValue(oldEntity, relationship.Value);

diff --git a/src/JsonApiDotNetCore/Data/IDbContextResolver.cs b/src/JsonApiDotNetCore/Data/IDbContextResolver.cs
@@ -0,0 +1,11 @@
+using Microsoft.EntityFrameworkCore;
+
+namespace JsonApiDotNetCore.Data
+{
+    public interface IDbContextResolver
+    {
+        DbContext GetContext();
+        DbSet<TEntity> GetDbSet<TEntity>() 
+            where TEntity : class;
+    }
+}
diff --git a/src/JsonApiDotNetCore/Extensions/IServiceCollectionExtensions.cs b/src/JsonApiDotNetCore/Extensions/IServiceCollectionExtensions.cs
@@ -89,6 +89,7 @@ public static void AddJsonApiInternals(
                 services.AddSingleton<DbContextOptions>(new DbContextOptionsBuilder().Options);
             }
 
+            services.AddScoped<IDbContextResolver, DbContextResolver>();
             services.AddScoped(typeof(IEntityRepository<>), typeof(DefaultEntityRepository<>));
             services.AddScoped(typeof(IEntityRepository<,>), typeof(DefaultEntityRepository<,>));
             services.AddScoped(typeof(IResourceService<>), typeof(EntityResourceService<>));

diff --git a/src/JsonApiDotNetCore/JsonApiDotNetCore.csproj b/src/JsonApiDotNetCore/JsonApiDotNetCore.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <VersionPrefix>2.0.6</VersionPrefix>
+    <VersionPrefix>2.0.7</VersionPrefix>
     <TargetFrameworks>netstandard1.6</TargetFrameworks>
     <AssemblyName>JsonApiDotNetCore</AssemblyName>
     <PackageId>JsonApiDotNetCore</PackageId>

diff --git a/src/JsonApiDotNetCore/Models/AttrAttribute.cs b/src/JsonApiDotNetCore/Models/AttrAttribute.cs
@@ -11,6 +11,12 @@ public AttrAttribute(string publicName)
             PublicAttributeName = publicName;
         }
 
+        public AttrAttribute(string publicName, string internalName)
+        {
+            PublicAttributeName = publicName;
+            InternalAttributeName = internalName;
+        }
+
         public string PublicAttributeName { get; set; }
         public string InternalAttributeName { get; set; }
 

diff --git a/src/JsonApiDotNetCore/Serialization/JsonApiDeSerializer.cs b/src/JsonApiDotNetCore/Serialization/JsonApiDeSerializer.cs
@@ -27,7 +27,7 @@ public JsonApiDeSerializer(
         public object Deserialize(string requestBody)
         {
             var document = JsonConvert.DeserializeObject<Document>(requestBody);
-            var entity = DataToObject(document.Data);
+            var entity = DocumentToObject(document.Data);
             return entity;
         }
 
@@ -46,30 +46,29 @@ public object DeserializeRelationship(string requestBody)
             return new List<DocumentData> { data.ToObject<DocumentData>() };
         }
 
-
         public List<TEntity> DeserializeList<TEntity>(string requestBody)
         {
             var documents = JsonConvert.DeserializeObject<Documents>(requestBody);
 
             var deserializedList = new List<TEntity>();
             foreach (var data in documents.Data)
             {
-                var entity = DataToObject(data);
+                var entity = DocumentToObject(data);
                 deserializedList.Add((TEntity)entity);
             }
 
             return deserializedList;
         }
 
-        private object DataToObject(DocumentData data)
+        private object DocumentToObject(DocumentData data)
         {
             var contextEntity = _jsonApiContext.ContextGraph.GetContextEntity(data.Type);
             _jsonApiContext.RequestEntity = contextEntity;
 
             var entity = Activator.CreateInstance(contextEntity.EntityType);
 
-            entity = _setEntityAttributes(entity, contextEntity, data.Attributes);
-            entity = _setRelationships(entity, contextEntity, data.Relationships);
+            entity = SetEntityAttributes(entity, contextEntity, data.Attributes);
+            entity = SetRelationships(entity, contextEntity, data.Relationships);
 
             var identifiableEntity = (IIdentifiable)entity;
 
@@ -79,7 +78,7 @@ private object DataToObject(DocumentData data)
             return identifiableEntity;
         }
 
-        private object _setEntityAttributes(
+        private object SetEntityAttributes(
             object entity, ContextEntity contextEntity, Dictionary<string, object> attributeValues)
         {
             if (attributeValues == null || attributeValues.Count == 0)
@@ -99,13 +98,14 @@ private object _setEntityAttributes(
                 {
                     var convertedValue = TypeHelper.ConvertType(newValue, entityProperty.PropertyType);
                     entityProperty.SetValue(entity, convertedValue);
+                    _jsonApiContext.AttributesToUpdate[attr] = convertedValue;
                 }
             }
 
             return entity;
         }
 
-        private object _setRelationships(
+        private object SetRelationships(
             object entity, 
             ContextEntity contextEntity, 
             Dictionary<string, RelationshipData> relationships)
@@ -118,14 +118,14 @@ private object _setRelationships(
             foreach (var attr in contextEntity.Relationships)
             {
                 entity = attr.IsHasOne 
-                    ? _setHasOneRelationship(entity, entityProperties, attr, contextEntity, relationships) 
-                    : _setHasManyRelationship(entity, entityProperties, attr, contextEntity, relationships);
+                    ? SetHasOneRelationship(entity, entityProperties, attr, contextEntity, relationships) 
+                    : SetHasManyRelationship(entity, entityProperties, attr, contextEntity, relationships);
             }
 
             return entity;
         }
 
-        private object _setHasOneRelationship(object entity, 
+        private object SetHasOneRelationship(object entity, 
             PropertyInfo[] entityProperties, 
             RelationshipAttribute attr, 
             ContextEntity contextEntity, 
@@ -158,7 +158,7 @@ private object _setHasOneRelationship(object entity,
             return entity;
         }
 
-        private object _setHasManyRelationship(object entity,
+        private object SetHasManyRelationship(object entity,
             PropertyInfo[] entityProperties, 
             RelationshipAttribute attr, 
             ContextEntity contextEntity, 

diff --git a/src/JsonApiDotNetCore/Services/IJsonApiContext.cs b/src/JsonApiDotNetCore/Services/IJsonApiContext.cs
@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using JsonApiDotNetCore.Builders;
 using JsonApiDotNetCore.Configuration;
+using JsonApiDotNetCore.Data;
 using JsonApiDotNetCore.Internal;
 using JsonApiDotNetCore.Internal.Generics;
 using JsonApiDotNetCore.Internal.Query;
@@ -22,6 +23,8 @@ public interface IJsonApiContext
         PageManager PageManager { get; set; }
         IMetaBuilder MetaBuilder { get; set; }
         IGenericProcessorFactory GenericProcessorFactory { get; set; }
+        Dictionary<AttrAttribute, object> AttributesToUpdate { get; set; }
         Dictionary<RelationshipAttribute, object> RelationshipsToUpdate { get; set; }
+        IDbContextResolver GetDbContextResolver();
     }
 }
diff --git a/src/JsonApiDotNetCore/Services/JsonApiContext.cs b/src/JsonApiDotNetCore/Services/JsonApiContext.cs
@@ -1,7 +1,9 @@
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using JsonApiDotNetCore.Builders;
 using JsonApiDotNetCore.Configuration;
+using JsonApiDotNetCore.Data;
 using JsonApiDotNetCore.Internal;
 using JsonApiDotNetCore.Internal.Generics;
 using JsonApiDotNetCore.Internal.Query;
@@ -13,19 +15,22 @@ namespace JsonApiDotNetCore.Services
     public class JsonApiContext : IJsonApiContext
     {
         private readonly IHttpContextAccessor _httpContextAccessor;
+        private readonly IDbContextResolver _contextResolver;
+
         public JsonApiContext(
+            IDbContextResolver contextResolver,
             IContextGraph contextGraph,
             IHttpContextAccessor httpContextAccessor,
             JsonApiOptions options,
             IMetaBuilder metaBuilder,
             IGenericProcessorFactory genericProcessorFactory)
         {
+            _contextResolver = contextResolver;
             ContextGraph = contextGraph;
             _httpContextAccessor = httpContextAccessor;
             Options = options;
             MetaBuilder = metaBuilder;
             GenericProcessorFactory = genericProcessorFactory;
-            RelationshipsToUpdate = new Dictionary<RelationshipAttribute, object>();
         }
 
         public JsonApiOptions Options { get; set; }
@@ -39,16 +44,17 @@ public JsonApiContext(
         public PageManager PageManager { get; set; }
         public IMetaBuilder MetaBuilder { get; set; }
         public IGenericProcessorFactory GenericProcessorFactory { get; set; }
-        public Dictionary<RelationshipAttribute, object> RelationshipsToUpdate { get; set; }
+        public Dictionary<AttrAttribute, object> AttributesToUpdate { get; set; } = new Dictionary<AttrAttribute, object>();
+        public Dictionary<RelationshipAttribute, object> RelationshipsToUpdate { get; set; } = new Dictionary<RelationshipAttribute, object>();
 
         public IJsonApiContext ApplyContext<T>()
         {
             var context = _httpContextAccessor.HttpContext;
             var path = context.Request.Path.Value.Split('/');
 
             RequestEntity = ContextGraph.GetContextEntity(typeof(T));
-            
-            if(context.Request.Query.Any())
+
+            if (context.Request.Query.Any())
             {
                 QuerySet = new QuerySet(this, context.Request.Query);
                 IncludedRelationships = QuerySet.IncludedRelationships;
@@ -61,14 +67,17 @@ public IJsonApiContext ApplyContext<T>()
             return this;
         }
 
+        public IDbContextResolver GetDbContextResolver() => _contextResolver;
+
         private PageManager GetPageManager()
         {
-            if(Options.DefaultPageSize == 0 && (QuerySet == null || QuerySet.PageQuery.PageSize == 0))
+            if (Options.DefaultPageSize == 0 && (QuerySet == null || QuerySet.PageQuery.PageSize == 0))
                 return new PageManager();
-
-            var query = QuerySet?.PageQuery ?? new PageQuery(); 
 
-            return new PageManager {
+            var query = QuerySet?.PageQuery ?? new PageQuery();
+
+            return new PageManager
+            {
                 DefaultPageSize = Options.DefaultPageSize,
                 CurrentPage = query.PageOffset > 0 ? query.PageOffset : 1,
                 PageSize = query.PageSize > 0 ? query.PageSize : Options.DefaultPageSize

diff --git a/...UnitTests/JsonApiControllerMixin_Tests.cs → ...ntrollers/JsonApiControllerMixin_Tests.cs b/...UnitTests/JsonApiControllerMixin_Tests.cs → ...ntrollers/JsonApiControllerMixin_Tests.cs