see description

refactor the context
add a resource repository for data access
rename service to router
add relational routing

Author: jaredcnance

JsonApiDotNetCore/Abstractions/IJsonApiResource.cs

@@ -1,4 +1,7 @@
-namespace JsonApiDotNetCore.Abstractions
+using System;
+using System.Collections.Generic;
+
+namespace JsonApiDotNetCore.Abstractions
 {
   public interface IJsonApiResource
   {

JsonApiDotNetCore/Abstractions/IModel.cs

@@ -0,0 +1,28 @@
+using System;
+using JsonApiDotNetCore.Configuration;
+using JsonApiDotNetCore.Routing;
+using Microsoft.AspNetCore.Http;
+
+namespace JsonApiDotNetCore.Abstractions
+{
+  public class JsonApiContext
+  {
+    public HttpContext HttpContext { get; }
+    public Route Route { get; }
+    public object DbContext { get; }
+    public JsonApiModelConfiguration Configuration { get; }
+
+    public JsonApiContext(HttpContext httpContext, Route route, object dbContext, JsonApiModelConfiguration configuration)
+    {
+      HttpContext = httpContext;
+      Route = route;
+      DbContext = dbContext;
+      Configuration = configuration;
+    }
+
+    public Type GetJsonApiResourceType()
+    {
+      return Configuration.ResourceMapDefinitions[Route.BaseModelType];
+    }
+  }
+}

JsonApiDotNetCore/Abstractions/JsonApiContext.cs

@@ -0,0 +1,19 @@
+using System;
+using System.ComponentModel;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Reflection;
+using JsonApiDotNetCore.Attributes;
+
+namespace JsonApiDotNetCore.Abstractions
+{
+  public static class ModelAccessor
+  {
+    public static Type GetTypeFromModelRelationshipName(object model, string relationshipName)
+    {
+      return model.GetType().GetProperties().Where(propertyInfo => propertyInfo.GetMethod.IsVirtual).ToList().FirstOrDefault(
+        virtualProperty => virtualProperty.Name == relationshipName)?.PropertyType;
+    }
+
+  }
+}

JsonApiDotNetCore/Abstractions/ModelAccessor.cs

@@ -0,0 +1,9 @@
+using System;
+
+namespace JsonApiDotNetCore.Attributes
+{
+  [AttributeUsage(AttributeTargets.Class | AttributeTargets.Struct)]
+  public class JsonApiIncludeAttribute : Attribute
+  {
+  }
+}

JsonApiDotNetCore/Attributes/JsonApiIncludeAttribute.cs

@@ -1,3 +1,5 @@
+using System;
+using System.Collections.Generic;
 using AutoMapper;
 
 namespace JsonApiDotNetCore.Configuration
@@ -6,6 +8,6 @@ public interface IJsonApiModelConfiguration
   {
     void UseContext<T>();
     void SetDefaultNamespace(string ns);
-    void DefineResourceMapping(MapperConfiguration mapperConfiguration);
+    void DefineResourceMapping(Action<Dictionary<Type,Type>> mapping);
   }
 }

JsonApiDotNetCore/Configuration/IJsonApiModelConfiguration.cs

@@ -13,19 +13,29 @@ namespace JsonApiDotNetCore.Configuration
   public class JsonApiModelConfiguration : IJsonApiModelConfiguration
   {
     public string Namespace;
-    public IMapper ResourceMaps;
+    public IMapper ResourceMapper;
     public Type ContextType { get; set; }
-
-    private readonly List<RouteDefinition> _routes = new List<RouteDefinition>();
+    public List<RouteDefinition> Routes = new List<RouteDefinition>();
+    public Dictionary<Type, Type>  ResourceMapDefinitions = new Dictionary<Type, Type>();
 
     public void SetDefaultNamespace(string ns)
     {
       Namespace = ns;
     }
 
-    public void DefineResourceMapping(MapperConfiguration mapperConfiguration)
+    public void DefineResourceMapping(Action<Dictionary<Type,Type>> mapping)
     {
-      ResourceMaps = mapperConfiguration.CreateMapper();
+      mapping.Invoke(ResourceMapDefinitions);
+
+      var mapConfiguration = new MapperConfiguration(cfg =>
+      {
+        foreach (var definition in ResourceMapDefinitions)
+        {
+          cfg.CreateMap(definition.Key, definition.Value);
+        }
+      });
+
+      ResourceMapper = mapConfiguration.CreateMapper();
     }
 
     public void UseContext<T>()
@@ -55,22 +65,10 @@ private void LoadModelRoutesFromContext()
             ContextPropertyName = property.Name
           };
 
-          _routes.Add(route);
+          Routes.Add(route);
         }
       });
     }
 
-    public Route GetRouteForRequest(HttpRequest request)
-    {
-      foreach (var rte in _routes)
-      {
-        PathString remainingPathString;
-        if (request.Path.StartsWithSegments(new PathString(rte.PathString), StringComparison.OrdinalIgnoreCase, out remainingPathString))
-        {
-          return new Route(rte.ModelType, request.Method, remainingPathString, rte);
-        }
-      }
-      return null;
-    }
   }
 }

JsonApiDotNetCore/Configuration/JsonApiModelConfiguration.cs

@@ -0,0 +1,21 @@
+using System;
+using JsonApiDotNetCore.Abstractions;
+using JsonApiDotNetCore.Data;
+
+namespace JsonApiDotNetCore.Controllers
+{
+  public class ControllerBuilder
+  {
+    private readonly JsonApiContext _context;
+
+    public ControllerBuilder(JsonApiContext context)
+    {
+      _context = context;
+    }
+
+    public JsonApiController BuildController()
+    {
+      return new JsonApiController(_context, new ResourceRepository(_context));
+    }
+  }
+}

JsonApiDotNetCore/Controllers/ControllerBuilder.cs

@@ -1,46 +1,45 @@
-using System;
-using Microsoft.AspNetCore.Http;
+using JsonApiDotNetCore.Abstractions;
+using JsonApiDotNetCore.Data;
 using Microsoft.AspNetCore.Mvc;
-using JsonApiDotNetCore.Services;
 
 namespace JsonApiDotNetCore.Controllers
 {
   public class JsonApiController
   {
-    private HttpContext _httpContext;
-    private readonly JsonApiContext _jsonApiContext;
+    protected readonly JsonApiContext JsonApiContext;
+    private readonly ResourceRepository _resourceRepository;
 
-    public JsonApiController(HttpContext context, JsonApiContext jsonApiContext)
+    public JsonApiController(JsonApiContext jsonApiContext, ResourceRepository resourceRepository)
     {
-      _jsonApiContext = jsonApiContext;
-      _httpContext = context;
+      JsonApiContext = jsonApiContext;
+      _resourceRepository = resourceRepository;
     }
 
     public ObjectResult Get()
     {
-      var entities = _jsonApiContext.Get();
+      var entities = _resourceRepository.Get();
       return new OkObjectResult(entities);
     }
 
     public ObjectResult Get(string id)
     {
-      var entity = _jsonApiContext.Get(id);
+      var entity = _resourceRepository.Get(id);
       return new OkObjectResult(entity);
     }
 
-    public IActionResult Post(object entity)
+    public ObjectResult Post(object entity)
     {
-      return new OkResult();
+      return new CreatedResult(JsonApiContext.HttpContext.Request.Path, entity);
     }
 
-    public IActionResult Put(string id, object entity)
+    public ObjectResult Put(string id, object entity)
     {
-      return new OkResult();
+      return new OkObjectResult(entity);
     }
 
-    public IActionResult Delete(string id)
+    public ObjectResult Delete(string id)
     {
-      return new OkResult();
+      return new OkObjectResult(null);
     }
   }
 }

JsonApiDotNetCore/Controllers/JsonApiController.cs

@@ -0,0 +1,59 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Expressions;
+using JsonApiDotNetCore.Abstractions;
+using System.Reflection;
+using JsonApiDotNetCore.Routing;
+using Microsoft.EntityFrameworkCore;
+
+namespace JsonApiDotNetCore.Data
+{
+  public class ResourceRepository
+  {
+    private readonly JsonApiContext _context;
+
+    public ResourceRepository(JsonApiContext context)
+    {
+      _context = context;
+    }
+
+    public List<object> Get()
+    {
+      return (GetDbSetFromContext(_context.Route.BaseRouteDefinition.ContextPropertyName) as IEnumerable<object>)?.ToList();
+    }
+
+    public object Get(string id)
+    {
+      var relationalRoute = _context.Route as RelationalRoute;
+      if (relationalRoute == null)
+      {
+        return GetEntityById(id);
+      }
+      return GetRelated(id, relationalRoute.RelationshipName);
+    }
+
+    private object GetRelated(string id, string relationshipName)
+    {
+      // HACK: this would rely on lazy loading to work...will probably fail
+      var entity = GetEntityById(id);
+      var entityType = entity.GetType();
+      return entityType.GetProperties().FirstOrDefault(pi => pi.Name == relationshipName).GetValue(entity);
+    }
+
+    private object GetDbSetFromContext(string propName)
+    {
+      var dbContext = _context.DbContext;
+      return dbContext.GetType().GetProperties().FirstOrDefault(pI => pI.Name == propName)?.GetValue(dbContext, null);
+    }
+
+    private object GetEntityById(string id)
+    {
+      // HACK: I _believe_ by casting to IEnumerable, we are loading all records into memory, if so... find a better way...
+      //        Also, we are making a BIG assumption that the resource has an attribute Id and not ResourceId which is allowed by EF
+      return
+        (GetDbSetFromContext(_context.Route.BaseRouteDefinition.ContextPropertyName) as IEnumerable<dynamic>)?
+          .FirstOrDefault(x => x.Id.ToString() == id);
+    }
+  }
+}