fix a couple mis-named things

Chris Santero · Chris Santero · commit d10b334238b4 · 2015-07-13T15:15:50.000-04:00
diff --git a/JSONAPI.AcceptanceTests.EntityFrameworkTestWebApp/DocumentMaterializers/StarshipShipCounselorRelatedResourceMaterializer.cs b/JSONAPI.AcceptanceTests.EntityFrameworkTestWebApp/DocumentMaterializers/StarshipShipCounselorRelatedResourceMaterializer.cs
@@ -23,7 +23,7 @@ public StarshipShipCounselorRelatedResourceMaterializer(
             _dbContext = dbContext;
         }
 
-        protected override async Task<StarshipOfficerDto> GeRelatedRecord(string primaryResourceId, CancellationToken cancellationToken)
+        protected override async Task<StarshipOfficerDto> GetRelatedRecord(string primaryResourceId, CancellationToken cancellationToken)
         {
             var query = _dbContext.Set<Starship>().Where(s => s.StarshipId == primaryResourceId)
                 .SelectMany(s => s.OfficerLinks)
diff --git a/JSONAPI.AcceptanceTests.EntityFrameworkTestWebApp/JSONAPI.AcceptanceTests.EntityFrameworkTestWebApp.csproj b/JSONAPI.AcceptanceTests.EntityFrameworkTestWebApp/JSONAPI.AcceptanceTests.EntityFrameworkTestWebApp.csproj
@@ -128,7 +128,7 @@
     <Compile Include="Controllers\TreesController.cs" />
     <Compile Include="CustomEntityFrameworkResourceObjectMaterializer.cs" />
     <Compile Include="DocumentMaterializers\StarshipDocumentMaterializer.cs" />
-    <Compile Include="DocumentMaterializers\StarshipOfficersRelatedResourceMaterializer - Copy.cs" />
+    <Compile Include="DocumentMaterializers\StarshipShipCounselorRelatedResourceMaterializer.cs" />
     <Compile Include="DocumentMaterializers\StarshipOfficersRelatedResourceMaterializer.cs" />
     <Compile Include="Models\Building.cs" />
     <Compile Include="Models\Comment.cs" />
diff --git a/JSONAPI.Autofac/JsonApiAutofacModule.cs b/JSONAPI.Autofac/JsonApiAutofacModule.cs
@@ -39,10 +39,24 @@ protected override void Load(ContainerBuilder builder)
                 if (resourceTypeConfiguration.DocumentMaterializerType != null)
                     builder.RegisterType(resourceTypeConfiguration.DocumentMaterializerType);
 
-                foreach (var relationshipConfiguration in resourceTypeConfiguration.RelationshipConfigurations)
+                foreach (var relationship in resourceTypeRegistration.Relationships)
                 {
-                    var relationship = relationshipConfiguration.Value;
-                    builder.RegisterType(relationship.MaterializerType);
+                    IResourceTypeRelationshipConfiguration relationshipConfiguration;
+                    if (resourceTypeConfiguration.RelationshipConfigurations
+                        .TryGetValue(relationship.Property, out relationshipConfiguration))
+                    {
+                        if (relationshipConfiguration.MaterializerType != null)
+                        {
+                            builder.RegisterType(relationshipConfiguration.MaterializerType);
+                            continue;
+                        }
+                    }
+
+                    // They didn't set an explicit materializer. See if they specified a factory for this resource type.
+                    if (configuration.RelatedResourceMaterializerTypeFactory == null) continue;
+
+                    var materializerType = configuration.RelatedResourceMaterializerTypeFactory(relationship);
+                    builder.RegisterType(materializerType);
                 }
             }
 
diff --git a/JSONAPI.EntityFramework/Http/EntityFrameworkToOneRelatedResourceDocumentMaterializer.cs b/JSONAPI.EntityFramework/Http/EntityFrameworkToOneRelatedResourceDocumentMaterializer.cs
@@ -34,7 +34,7 @@ public EntityFrameworkToOneRelatedResourceDocumentMaterializer(
             _dbContext = dbContext;
         }
 
-        protected override async Task<TRelated> GeRelatedRecord(string primaryResourceId, CancellationToken cancellationToken)
+        protected override async Task<TRelated> GetRelatedRecord(string primaryResourceId, CancellationToken cancellationToken)
         {
             var param = Expression.Parameter(typeof(TPrimaryResource));
             var accessorExpr = Expression.Property(param, _relationship.Property);
diff --git a/JSONAPI/Http/QueryableToOneRelatedResourceDocumentMaterializer.cs b/JSONAPI/Http/QueryableToOneRelatedResourceDocumentMaterializer.cs
@@ -28,14 +28,14 @@ protected QueryableToOneRelatedResourceDocumentMaterializer(
         public async Task<IJsonApiDocument> GetRelatedResourceDocument(string primaryResourceId, HttpRequestMessage request,
             CancellationToken cancellationToken)
         {
-            var record = await GeRelatedRecord(primaryResourceId, cancellationToken);
+            var record = await GetRelatedRecord(primaryResourceId, cancellationToken);
             var baseUrl = _baseUrlService.GetBaseUrl(request);
             return _singleResourceDocumentBuilder.BuildDocument(record, baseUrl, null, null); // TODO: allow implementors to specify includes and metadata
         }
 
         /// <summary>
         /// Gets the query for the related resources
         /// </summary>
-        protected abstract Task<TRelated> GeRelatedRecord(string primaryResourceId, CancellationToken cancellationToken);
+        protected abstract Task<TRelated> GetRelatedRecord(string primaryResourceId, CancellationToken cancellationToken);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ public StarshipShipCounselorRelatedResourceMaterializer(`
`23`	`23`	`_dbContext = dbContext;`
`24`	`24`	`}`
`25`	`25`
`26`		`- protected override async Task<StarshipOfficerDto> GeRelatedRecord(string primaryResourceId, CancellationToken cancellationToken)`
	`26`	`+ protected override async Task<StarshipOfficerDto> GetRelatedRecord(string primaryResourceId, CancellationToken cancellationToken)`
`27`	`27`	`{`
`28`	`28`	`var query = _dbContext.Set<Starship>().Where(s => s.StarshipId == primaryResourceId)`
`29`	`29`	`.SelectMany(s => s.OfficerLinks)`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public EntityFrameworkToOneRelatedResourceDocumentMaterializer(`
`34`	`34`	`_dbContext = dbContext;`
`35`	`35`	`}`
`36`	`36`
`37`		`- protected override async Task<TRelated> GeRelatedRecord(string primaryResourceId, CancellationToken cancellationToken)`
	`37`	`+ protected override async Task<TRelated> GetRelatedRecord(string primaryResourceId, CancellationToken cancellationToken)`
`38`	`38`	`{`
`39`	`39`	`var param = Expression.Parameter(typeof(TPrimaryResource));`
`40`	`40`	`var accessorExpr = Expression.Property(param, _relationship.Property);`
Original file line number	Diff line number	Diff line change
`@@ -28,14 +28,14 @@ protected QueryableToOneRelatedResourceDocumentMaterializer(`
`28`	`28`	`public async Task<IJsonApiDocument> GetRelatedResourceDocument(string primaryResourceId, HttpRequestMessage request,`
`29`	`29`	`CancellationToken cancellationToken)`
`30`	`30`	`{`
`31`		`- var record = await GeRelatedRecord(primaryResourceId, cancellationToken);`
	`31`	`+ var record = await GetRelatedRecord(primaryResourceId, cancellationToken);`
`32`	`32`	`var baseUrl = _baseUrlService.GetBaseUrl(request);`
`33`	`33`	`return _singleResourceDocumentBuilder.BuildDocument(record, baseUrl, null, null); // TODO: allow implementors to specify includes and metadata`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`/// <summary>`
`37`	`37`	`/// Gets the query for the related resources`
`38`	`38`	`/// </summary>`
`39`		`- protected abstract Task<TRelated> GeRelatedRecord(string primaryResourceId, CancellationToken cancellationToken);`
	`39`	`+ protected abstract Task<TRelated> GetRelatedRecord(string primaryResourceId, CancellationToken cancellationToken);`
`40`	`40`	`}`
`41`	`41`	`}`