Use ModelBuilder in sample to not depend on EF Core internals, build once at startup

Author: bkoelman

src/Examples/NoEntityFrameworkExample/Data/InMemoryModel.cs

@@ -0,0 +1,32 @@
+using System.Reflection;
+using JsonApiDotNetCore.Configuration;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
+
+namespace NoEntityFrameworkExample.Data;
+
+internal static class ResourceGraphExtensions
+{
+    public static IReadOnlyModel ToEntityModel(this IResourceGraph resourceGraph)
+    {
+        var modelBuilder = new ModelBuilder();
+
+        foreach (ResourceType resourceType in resourceGraph.GetResourceTypes())
+        {
+            IncludeResourceType(resourceType, modelBuilder);
+        }
+
+        return modelBuilder.Model;
+    }
+
+    private static void IncludeResourceType(ResourceType resourceType, ModelBuilder builder)
+    {
+        EntityTypeBuilder entityTypeBuilder = builder.Entity(resourceType.ClrType);
+
+        foreach (PropertyInfo property in resourceType.ClrType.GetProperties())
+        {
+            entityTypeBuilder.Property(property.PropertyType, property.Name);
+        }
+    }
+}

src/Examples/NoEntityFrameworkExample/Data/ResourceGraphExtensions.cs

@@ -1,5 +1,6 @@
 using JsonApiDotNetCore.Configuration;
 using NoEntityFrameworkExample;
+using NoEntityFrameworkExample.Data;
 
 WebApplicationBuilder builder = WebApplication.CreateBuilder(args);
 
@@ -20,6 +21,12 @@
 #endif
 }, discovery => discovery.AddCurrentAssembly());
 
+builder.Services.AddSingleton(serviceProvider =>
+{
+    var resourceGraph = serviceProvider.GetRequiredService<IResourceGraph>();
+    return resourceGraph.ToEntityModel();
+});
+
 WebApplication app = builder.Build();
 
 // Configure the HTTP request pipeline.

src/Examples/NoEntityFrameworkExample/Program.cs

@@ -4,7 +4,7 @@
 using JsonApiDotNetCore.Queries.QueryableBuilding;
 using JsonApiDotNetCore.Repositories;
 using JsonApiDotNetCore.Resources;
-using NoEntityFrameworkExample.Data;
+using Microsoft.EntityFrameworkCore.Metadata;
 
 namespace NoEntityFrameworkExample.Repositories;
 
@@ -19,19 +19,12 @@ namespace NoEntityFrameworkExample.Repositories;
 /// <typeparam name="TId">
 /// The resource identifier type.
 /// </typeparam>
-public abstract class InMemoryResourceRepository<TResource, TId> : IResourceReadRepository<TResource, TId>
+public abstract class InMemoryResourceRepository<TResource, TId>(IResourceGraph resourceGraph, IQueryableBuilder queryableBuilder, IReadOnlyModel entityModel)
+    : IResourceReadRepository<TResource, TId>
     where TResource : class, IIdentifiable<TId>
 {
-    private readonly ResourceType _resourceType;
-    private readonly QueryLayerToLinqConverter _queryLayerToLinqConverter;
-
-    protected InMemoryResourceRepository(IResourceGraph resourceGraph, IQueryableBuilder queryableBuilder)
-    {
-        _resourceType = resourceGraph.GetResourceType<TResource>();
-
-        var model = new InMemoryModel(resourceGraph);
-        _queryLayerToLinqConverter = new QueryLayerToLinqConverter(model, queryableBuilder);
-    }
+    private readonly ResourceType _resourceType = resourceGraph.GetResourceType<TResource>();
+    private readonly QueryLayerToLinqConverter _queryLayerToLinqConverter = new(entityModel, queryableBuilder);
 
     /// <inheritdoc />
     public Task<IReadOnlyCollection<TResource>> GetAsync(QueryLayer queryLayer, CancellationToken cancellationToken)

src/Examples/NoEntityFrameworkExample/Repositories/InMemoryResourceRepository.cs

@@ -1,14 +1,15 @@
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Queries.QueryableBuilding;
+using Microsoft.EntityFrameworkCore.Metadata;
 using NoEntityFrameworkExample.Data;
 using NoEntityFrameworkExample.Models;
 
 namespace NoEntityFrameworkExample.Repositories;
 
 [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
-public sealed class PersonRepository(IResourceGraph resourceGraph, IQueryableBuilder queryableBuilder)
-    : InMemoryResourceRepository<Person, long>(resourceGraph, queryableBuilder)
+public sealed class PersonRepository(IResourceGraph resourceGraph, IQueryableBuilder queryableBuilder, IReadOnlyModel entityModel)
+    : InMemoryResourceRepository<Person, long>(resourceGraph, queryableBuilder, entityModel)
 {
     protected override IEnumerable<Person> GetDataSource()
     {

src/Examples/NoEntityFrameworkExample/Repositories/PersonRepository.cs

@@ -1,14 +1,15 @@
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Queries.QueryableBuilding;
+using Microsoft.EntityFrameworkCore.Metadata;
 using NoEntityFrameworkExample.Data;
 using NoEntityFrameworkExample.Models;
 
 namespace NoEntityFrameworkExample.Repositories;
 
 [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
-public sealed class TagRepository(IResourceGraph resourceGraph, IQueryableBuilder queryableBuilder)
-    : InMemoryResourceRepository<Tag, long>(resourceGraph, queryableBuilder)
+public sealed class TagRepository(IResourceGraph resourceGraph, IQueryableBuilder queryableBuilder, IReadOnlyModel entityModel)
+    : InMemoryResourceRepository<Tag, long>(resourceGraph, queryableBuilder, entityModel)
 {
     protected override IEnumerable<Tag> GetDataSource()
     {

src/Examples/NoEntityFrameworkExample/Repositories/TagRepository.cs

@@ -1,14 +1,15 @@
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Queries.QueryableBuilding;
+using Microsoft.EntityFrameworkCore.Metadata;
 using NoEntityFrameworkExample.Data;
 using NoEntityFrameworkExample.Models;
 
 namespace NoEntityFrameworkExample.Repositories;
 
 [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
-public sealed class TodoItemRepository(IResourceGraph resourceGraph, IQueryableBuilder queryableBuilder)
-    : InMemoryResourceRepository<TodoItem, long>(resourceGraph, queryableBuilder)
+public sealed class TodoItemRepository(IResourceGraph resourceGraph, IQueryableBuilder queryableBuilder, IReadOnlyModel entityModel)
+    : InMemoryResourceRepository<TodoItem, long>(resourceGraph, queryableBuilder, entityModel)
 {
     protected override IEnumerable<TodoItem> GetDataSource()
     {

src/Examples/NoEntityFrameworkExample/Repositories/TodoItemRepository.cs

@@ -7,7 +7,7 @@
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 using JsonApiDotNetCore.Services;
-using NoEntityFrameworkExample.Data;
+using Microsoft.EntityFrameworkCore.Metadata;
 
 namespace NoEntityFrameworkExample.Services;
 
@@ -30,32 +30,19 @@ namespace NoEntityFrameworkExample.Services;
 /// <typeparam name="TId">
 /// The resource identifier type.
 /// </typeparam>
-public abstract class InMemoryResourceService<TResource, TId> : IResourceQueryService<TResource, TId>
+public abstract class InMemoryResourceService<TResource, TId>(
+    IJsonApiOptions options, IResourceGraph resourceGraph, IQueryLayerComposer queryLayerComposer, IPaginationContext paginationContext,
+    IEnumerable<IQueryConstraintProvider> constraintProviders, IQueryableBuilder queryableBuilder, IReadOnlyModel entityModel,
+    ILoggerFactory loggerFactory) : IResourceQueryService<TResource, TId>
     where TResource : class, IIdentifiable<TId>
 {
-    private readonly IJsonApiOptions _options;
-    private readonly IQueryLayerComposer _queryLayerComposer;
-    private readonly IPaginationContext _paginationContext;
-    private readonly IEnumerable<IQueryConstraintProvider> _constraintProviders;
-    private readonly ILogger<InMemoryResourceService<TResource, TId>> _logger;
-    private readonly ResourceType _resourceType;
-    private readonly QueryLayerToLinqConverter _queryLayerToLinqConverter;
-
-    protected InMemoryResourceService(IJsonApiOptions options, IResourceGraph resourceGraph, IQueryLayerComposer queryLayerComposer,
-        IPaginationContext paginationContext, IEnumerable<IQueryConstraintProvider> constraintProviders, IQueryableBuilder queryableBuilder,
-        ILoggerFactory loggerFactory)
-    {
-        _options = options;
-        _queryLayerComposer = queryLayerComposer;
-        _paginationContext = paginationContext;
-        _constraintProviders = constraintProviders;
-
-        _logger = loggerFactory.CreateLogger<InMemoryResourceService<TResource, TId>>();
-        _resourceType = resourceGraph.GetResourceType<TResource>();
-
-        var model = new InMemoryModel(resourceGraph);
-        _queryLayerToLinqConverter = new QueryLayerToLinqConverter(model, queryableBuilder);
-    }
+    private readonly IJsonApiOptions _options = options;
+    private readonly IQueryLayerComposer _queryLayerComposer = queryLayerComposer;
+    private readonly IPaginationContext _paginationContext = paginationContext;
+    private readonly IEnumerable<IQueryConstraintProvider> _constraintProviders = constraintProviders;
+    private readonly ILogger<InMemoryResourceService<TResource, TId>> _logger = loggerFactory.CreateLogger<InMemoryResourceService<TResource, TId>>();
+    private readonly ResourceType _resourceType = resourceGraph.GetResourceType<TResource>();
+    private readonly QueryLayerToLinqConverter _queryLayerToLinqConverter = new(entityModel, queryableBuilder);
 
     /// <inheritdoc />
     public Task<IReadOnlyCollection<TResource>> GetAsync(CancellationToken cancellationToken)

src/Examples/NoEntityFrameworkExample/Services/InMemoryResourceService.cs

@@ -3,6 +3,7 @@
 using JsonApiDotNetCore.Queries;
 using JsonApiDotNetCore.Queries.QueryableBuilding;
 using JsonApiDotNetCore.Resources;
+using Microsoft.EntityFrameworkCore.Metadata;
 using NoEntityFrameworkExample.Data;
 using NoEntityFrameworkExample.Models;
 
@@ -11,8 +12,8 @@ namespace NoEntityFrameworkExample.Services;
 [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
 public sealed class TodoItemService(
     IJsonApiOptions options, IResourceGraph resourceGraph, IQueryLayerComposer queryLayerComposer, IPaginationContext paginationContext,
-    IEnumerable<IQueryConstraintProvider> constraintProviders, IQueryableBuilder queryableBuilder, ILoggerFactory loggerFactory)
-    : InMemoryResourceService<TodoItem, long>(options, resourceGraph, queryLayerComposer, paginationContext, constraintProviders, queryableBuilder,
+    IEnumerable<IQueryConstraintProvider> constraintProviders, IQueryableBuilder queryableBuilder, IReadOnlyModel entityModel, ILoggerFactory loggerFactory)
+    : InMemoryResourceService<TodoItem, long>(options, resourceGraph, queryLayerComposer, paginationContext, constraintProviders, queryableBuilder, entityModel,
         loggerFactory)
 {
     protected override IEnumerable<IIdentifiable> GetDataSource(ResourceType resourceType)