customize mapping manager

Author: Ihar Yakimush

README.md

@@ -3,7 +3,7 @@ SolrNet IQueryable provider. Extend SolrNet functionality by adding limited LINQ
 
 ## Code Sample
 ### Prerequisites
-To use LINQ with SolrNet you need to have `ISolrOperations<TEntity>` or even `ISolrBasicReadOnlyOperations<TEntity>` where `TEntity` is a type with properties marked with `SolrField` attribute. For instance 
+To use LINQ with SolrNet you need to have `ISolrOperations<TEntity>` or even `ISolrBasicReadOnlyOperations<TEntity>`. By default `TEntity` should be a type with properties marked with `SolrField` attribute, however it is not mandatory if you going to set another mapping manager when initializing a query. For instance 
 ```
 public class Product
 {
@@ -40,7 +40,7 @@ It is possible to combine linq and regular SolrNet QueryOptions and main query.
 IQueryable<Product> solrLinq = solr.AsQueryable(setup =>
 {
     // Set q parameter. By default *:* will be used.
-	// LINQ Where method append fq (Filter Query) to query options and not affect main query
+    // LINQ Where method append fq (Filter Query) to query options and not affect main query
     options.MainQuery = new SolrQuery("some query");
 
     // Configure SolrNet QueryOptions.
@@ -53,6 +53,9 @@ IQueryable<Product> solrLinq = solr.AsQueryable(setup =>
 
     // override default serializer if needed
     options.SolrFieldSerializer = new DefaultFieldSerializer();
+
+	// override default mapping manager if needed
+    options.MappingManager = new AttributesMappingManager();
 });
 ```
 

SolrNet.IntegrationOData/Controllers/ValuesController.cs

@@ -7,6 +7,7 @@
 using Microsoft.AspNetCore.Mvc;
 using SolrNet.Impl.FieldSerializers;
 using SolrNet.Linq;
+using SolrNet.Mapping;
 
 namespace SolrNet.IntegrationOData.Controllers
 {
@@ -52,6 +53,9 @@ public ActionResult<string> Get(int id, ODataQueryOptions odata)
 
                 // override default serializer if needed
                 options.SolrFieldSerializer = new DefaultFieldSerializer();
+
+                // override default mapping manager if needed
+                options.MappingManager = new AttributesMappingManager();
             });
 
             return this.Ok(query.OData().ApplyQueryOptionsWithoutSelectExpand(odata).ToSolrQueryResults());

SolrNet.Linq/Expressions/Context/MemberContext.cs

@@ -4,13 +4,17 @@
 using SolrNet.Impl;
 using SolrNet.Impl.FieldParsers;
 using SolrNet.Impl.FieldSerializers;
+using SolrNet.Mapping;
 
 namespace SolrNet.Linq.Expressions.Context
 {
     public abstract class MemberContext
     {        
         private static readonly DefaultFieldSerializer DefaultFieldSerializer = new DefaultFieldSerializer();
+        private static IReadOnlyMappingManager DefaultMappingManager { get; } = new AttributesMappingManager();
+
         private ISolrFieldSerializer _fieldSerializer;
+        private IReadOnlyMappingManager _mappingManager;
         public abstract bool HasMemberAccess(Expression expression);
 
         public abstract string GetSolrMemberProduct(Expression expression, bool disableFunctions = false);
@@ -42,5 +46,11 @@ public ISolrFieldSerializer FieldSerializer
             get => _fieldSerializer ?? DefaultFieldSerializer;
             set => _fieldSerializer = value;
         }
+
+        public IReadOnlyMappingManager MappingManager
+        {
+            get => _mappingManager ?? DefaultMappingManager;
+            set => _mappingManager = value;
+        }        
     }
 }

SolrNet.Linq/Expressions/MemberExpressionExtensions.cs

@@ -30,18 +30,20 @@ public static class MemberExpressionExtensions
 
         private static readonly ConcurrentDictionary<MemberInfo, string> MemberNames = new ConcurrentDictionary<MemberInfo, string>();
 
-        public static string GetMemberSolrName(this MemberInfo info)
+        private static string GetMemberSolrName(this MemberInfo info, IReadOnlyMappingManager mappingManager)
         {
             return MemberNames.GetOrAdd(info, m =>
             {
-                SolrFieldAttribute att = m.GetCustomAttributes().OfType<SolrFieldAttribute>().FirstOrDefault();
+                var att = mappingManager.GetFields(info.DeclaringType);
 
-                if (att == null)
+                SolrFieldModel value = att.Values.FirstOrDefault(f => f.Property == info as PropertyInfo);
+                if (value != null)
                 {
-                    throw new InvalidOperationException($"Unable to get solr name for {m.DeclaringType}.{m.Name}");
+                    return value.FieldName;
                 }
 
-                return att.FieldName;
+                throw new InvalidOperationException(
+                    $"Unable to get solr name for {m.DeclaringType}.{m.Name}. Mapping manager has mappings only for {string.Join(", ", att.Values.Select(f => f.Property.Name))}");
             });
         }
 
@@ -57,7 +59,7 @@ internal static string GetSolrMemberProduct(this Expression exp, MemberContext c
 
                     if (context.IsAccessToMember(me))
                     {
-                        return memberInfo.GetMemberSolrName();
+                        return memberInfo.GetMemberSolrName(context.MappingManager);
                     }
 
                     if (me.Member.DeclaringType != null &&

SolrNet.Linq/SolrNet.Linq.csproj

@@ -13,7 +13,7 @@
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <Version>1.1.0</Version>
-    <PackageReleaseNotes>ability to customize field serializer</PackageReleaseNotes>
+    <PackageReleaseNotes>ability to customize field serializer and mapping manager</PackageReleaseNotes>
   </PropertyGroup>
 
   <ItemGroup>

SolrNet.Linq/SolrNetLinqOptions.cs

@@ -1,6 +1,8 @@
 using System;
 using SolrNet.Commands.Parameters;
 using SolrNet.Impl;
+using SolrNet.Impl.FieldSerializers;
+using SolrNet.Mapping;
 
 namespace SolrNet.Linq
 {
@@ -9,10 +11,24 @@ namespace SolrNet.Linq
     /// </summary>
     public class SolrNetLinqOptions
     {
+        /// <summary>
+        /// Set main query (q SOLR parameter). By default *:* will be used. LINQ Where method append fq (Filter Query) to query options and not affect main query.
+        /// </summary>
         public ISolrQuery MainQuery { get; set; } = null;
 
+        /// <summary>
+        /// Action to perform additional setup of <see cref="QueryOptions"/> SolrNet QueryOptions. Useful to set options not supported by LINQ. Will be applied after translating LINQ expression. 
+        /// </summary>
         public Action<QueryOptions> SetupQueryOptions { get; set; } = null;
 
+        /// <summary>
+        /// Set <see cref="ISolrFieldSerializer"/> field serializer. If not set <see cref="DefaultFieldSerializer"/> default SolrNet field serializer will be used.
+        /// </summary>
         public ISolrFieldSerializer SolrFieldSerializer { get; set; } = null;
+
+        /// <summary>
+        /// Set <see cref="IReadOnlyMappingManager"/> field mapping manager. If not set <see cref="AttributesMappingManager"/> attributes mapping manager will be used.
+        /// </summary>
+        public IReadOnlyMappingManager MappingManager { get; set; } = null;
     }
 }

SolrNet.Linq/SolrQueryProvider.cs

@@ -58,6 +58,7 @@ public Task<SolrQueryResults<TEntity>> ExecuteAsync(Expression expression)
             SolrQueryTranslator<TEntity> translator = new SolrQueryTranslator<TEntity>(this.Options);
             var result = translator.Translate(this, expression);
             this.Options.SetupQueryOptions?.Invoke(result.Item2);
+            
             return Operations.QueryAsync(this.Options.MainQuery ?? result.Item1, result.Item2);
         }
 

SolrNet.Linq/SolrQueryTranslator.cs

@@ -33,6 +33,7 @@ protected override Expression VisitMethodCall(MethodCallExpression node)
             result |= node.TryVisitSkip(this.Options);
             MemberContext context = MemberContext.ForType<TEntity>();
             context.FieldSerializer = this.SolrNetLinqOptions.SolrFieldSerializer;
+            context.MappingManager = this.SolrNetLinqOptions.MappingManager;
 
             result |= node.TryVisitSorting(this.Options, context);
             result |= node.TryVisitWhere(this.Options, context);