Fix hidden type

Fix hidden type

Author: zzzprojects

src/shared/Z.EF.Plus.QueryFilterInterceptor.Shared/QueryFilterInterceptorContext.cs

@@ -298,68 +298,88 @@ private void Initialize(DbContext context)
                     }
                 }
             }
-           
+
+
+            var entityTypes = context.GetObjectContext().MetadataWorkspace.GetItemCollection(DataSpace.OSpace)
+                .Where(x => x.BuiltInTypeKind == BuiltInTypeKind.EntityType);
+
+            foreach (var entityType in entityTypes)
+            {
+                var typeField = entityType.GetType().GetField("_type", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
+
+                if (typeField != null)
+                {
+                    var type = (Type)typeField.GetValue(entityType);
+                    TryRegisterType(context, type);
+                }
+            }
+
             foreach (var type in QueryFilterManager.Types)
             {
-                var setMethod = context.GetType().GetMethod("Set", new Type[0]);
-                var dbSet = setMethod.MakeGenericMethod(type).Invoke(context, null);
+                TryRegisterType(context, type);
+            }
+        }
 
-                Type elementType = type;
+        private void TryRegisterType(DbContext context, Type type)
+        {
+            var setMethod = context.GetType().GetMethod("Set", new Type[0]);
+            var dbSet = setMethod.MakeGenericMethod(type).Invoke(context, null);
 
-                // DbSet<>.InternalQuery
-                var internalQueryProperty = typeof(DbQuery<>).MakeGenericType(elementType).GetProperty("InternalQuery", BindingFlags.NonPublic | BindingFlags.Instance);
-                var internalQuery = internalQueryProperty.GetValue(dbSet, null);
+            Type elementType = type;
 
-                var entityTypebase = type.FullName;
+            // DbSet<>.InternalQuery
+            var internalQueryProperty = typeof(DbQuery<>).MakeGenericType(elementType).GetProperty("InternalQuery", BindingFlags.NonPublic | BindingFlags.Instance);
+            var internalQuery = internalQueryProperty.GetValue(dbSet, null);
 
-                try
-                {
-                    // DbSet<>.InternalQuery.EntitySet
-                    var entitySetProperty = internalQuery.GetType().GetProperty("EntitySet", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
-                    var entitySet = (EntitySet)entitySetProperty.GetValue(internalQuery, null);
+            var entityTypebase = type.FullName;
 
-                    entityTypebase = entitySet.ElementType.FullName;
-                }
-                catch
-                {
-                    // Silence catch, it's k... it doesn't always exist!
-                   
-                }
+            try
+            {
+                // DbSet<>.InternalQuery.EntitySet
+                var entitySetProperty = internalQuery.GetType().GetProperty("EntitySet", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
+                var entitySet = (EntitySet)entitySetProperty.GetValue(internalQuery, null);
 
-                // TypeByEntitySetBase
+                entityTypebase = entitySet.ElementType.FullName;
+            }
+            catch
+            {
+                // Silence catch, it's k... it doesn't always exist!
+
+            }
+
+            // TypeByEntitySetBase
+            {
+                if (!TypeByEntitySetBase.ContainsKey(entityTypebase))
                 {
-                    if (!TypeByEntitySetBase.ContainsKey(entityTypebase))
-                    {
-                        TypeByEntitySetBase.Add(entityTypebase, elementType);
-                    }
+                    TypeByEntitySetBase.Add(entityTypebase, elementType);
                 }
+            }
 
-                // TypeByDbSet
+            // TypeByDbSet
+            {
+                var baseType = elementType;
+
+                var types = new List<Type>();
+                while (baseType != null && baseType != typeof(object))
                 {
-                    var baseType = elementType;
+                    types.Add(baseType);
 
-                    var types = new List<Type>();
-                    while (baseType != null && baseType != typeof(object))
+                    // LINK interface
+                    var interfaces = baseType.GetInterfaces();
+                    foreach (var @interface in interfaces)
                     {
-                        types.Add(baseType);
-
-                        // LINK interface
-                        var interfaces = baseType.GetInterfaces();
-                        foreach (var @interface in interfaces)
-                        {
-                            types.Add(@interface);
-                        }
-
-                        baseType = baseType.BaseType;
+                        types.Add(@interface);
                     }
 
-                    // ENSURE all discting
-                    types = types.Distinct().ToList();
+                    baseType = baseType.BaseType;
+                }
 
-                    if (!TypeByDbSet.ContainsKey(entityTypebase))
-                    {
-                        TypeByDbSet.Add(entityTypebase, types);
-                    }
+                // ENSURE all discting
+                types = types.Distinct().ToList();
+
+                if (!TypeByDbSet.ContainsKey(entityTypebase))
+                {
+                    TypeByDbSet.Add(entityTypebase, types);
                 }
             }
         }

version.txt

@@ -1 +1 @@
-v1.7.2
+v1.7.3