fix: review round 31/08

Author: maurei

src/JsonApiDotNetCore/Builders/JsonApiApplicationBuilder.cs

@@ -152,7 +152,7 @@ public void ConfigureServices(Type dbContextType)
                 AddResourceHooks();
             }
 
-            _services.AddScoped<IInverseRelationships, InverseRelationships>();
+            _services.TryAddScoped<IInverseRelationships, InverseRelationships>();
         }
 
         private void AddMiddlewareLayer()

src/JsonApiDotNetCore/Extensions/ApplicationBuilderExtensions.cs

@@ -26,6 +26,11 @@ public static class ApplicationBuilderExtensions
         /// </example>
         public static void UseJsonApi(this IApplicationBuilder builder)
         {
+            
+            using var scope = builder.ApplicationServices.GetRequiredService<IServiceScopeFactory>().CreateScope();
+            var inverseRelationshipResolver = scope.ServiceProvider.GetRequiredService<IInverseRelationships>();
+            inverseRelationshipResolver.Resolve();
+            
             var jsonApiApplicationBuilder =  builder.ApplicationServices.GetRequiredService<IJsonApiApplicationBuilder>();
             jsonApiApplicationBuilder.ConfigureMvcOptions = options =>
             {

src/JsonApiDotNetCore/Extensions/ServiceCollectionExtensions.cs

@@ -27,7 +27,6 @@ public static IServiceCollection AddJsonApi(this IServiceCollection services,
             IMvcCoreBuilder mvcBuilder = null)
         {
             SetupApplicationBuilder(services, options, discovery, resources, mvcBuilder, null);
-            ResolveInverseRelationships(services);
 
             return services;
         }
@@ -44,7 +43,6 @@ public static IServiceCollection AddJsonApi<TDbContext>(this IServiceCollection
             where TDbContext : DbContext
         {
             SetupApplicationBuilder(services, options, discovery, resources, mvcBuilder, typeof(TDbContext));
-            ResolveInverseRelationships(services);
 
             return services;
         }     

src/JsonApiDotNetCore/Internal/InverseRelationships.cs

@@ -48,13 +48,20 @@ public void Resolve()
                 foreach (ResourceContext ce in _provider.GetResourceContexts())
                 {
                     IEntityType meta = context.Model.FindEntityType(ce.ResourceType);
-                    if (meta == null) continue;
+                    if (meta == null)
+                    {
+                        continue;
+                    }
+                    
                     foreach (var attr in ce.Relationships)
                     {
-                        if (attr is HasManyThroughAttribute) continue;
+                        if (attr is HasManyThroughAttribute)
+                        {
+                            continue;
+                        }
                         INavigation inverseNavigation = meta.FindNavigation(attr.Property.Name)?.FindInverse();
                         attr.InverseNavigation = inverseNavigation?.Name;
-                    }
+                    }          
                 }
             }
         }