nuget package

Author: Ihar Yakimush

Community.Data.OData.Linq.xTests/Community.OData.Linq.xTests.csproj

@@ -4,6 +4,10 @@
     <TargetFramework>netcoreapp2.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
+
+    <SignAssembly>true</SignAssembly>
+
+    <AssemblyOriginatorKeyFile>Sign.pfx</AssemblyOriginatorKeyFile>
   </PropertyGroup>
 
   <ItemGroup>

Community.Data.OData.Linq.xTests/ODataQueryTests.cs

@@ -2,6 +2,19 @@
 
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;net45</TargetFrameworks>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>Sign.pfx</AssemblyOriginatorKeyFile>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
+    <Authors>IharYakimush</Authors>
+    <PackageLicenseUrl>https://github.com/IharYakimush/comminity-data-odata-linq/blob/master/LICENSE</PackageLicenseUrl>
+    <PackageProjectUrl>https://github.com/IharYakimush/comminity-data-odata-linq</PackageProjectUrl>
+    <RepositoryType></RepositoryType>
+    <PackageTags>odata linq filter</PackageTags>
+    <PackageReleaseNotes />
+    <Description>Use OData text filter in LINQ for any IQuerable without ASP.NET dependency</Description>
+    <Company />
+    <RepositoryUrl></RepositoryUrl>
   </PropertyGroup>
 
   <ItemGroup>

Community.Data.OData.Linq/Community.OData.Linq.csproj

@@ -1,12 +1,41 @@
 namespace Community.OData.Linq
 {
     using System;
+    using System.Collections;
+    using System.Collections.Generic;
     using System.Linq;
+    using System.Linq.Expressions;
 
-    public class ODataQueryOrdered<T> : ODataQuery<T>
+    using Microsoft.Extensions.DependencyInjection;
+    using Microsoft.OData.Edm;
+
+    public class ODataQuery<T> : IQueryable<T>
     {
-        public ODataQueryOrdered(IOrderedQueryable inner, IServiceProvider serviceProvider):base(inner,serviceProvider)
+        internal ODataQuery(IQueryable inner, IServiceProvider serviceProvider)
+        {
+            this.Inner = inner ?? throw new ArgumentNullException(nameof(inner));
+            this.ServiceProvider = serviceProvider;
+        }
+
+        public IEdmModel EdmModel => this.ServiceProvider.GetRequiredService<IEdmModel>();
+
+        public Type ElementType => this.Inner.ElementType;
+
+        public Expression Expression => this.Inner.Expression;
+
+        public IQueryProvider Provider => this.Inner.Provider;
+
+        public IQueryable Inner { get; }
+        public IServiceProvider ServiceProvider { get; }
+
+        public IEnumerator GetEnumerator()
+        {
+            return this.Inner.GetEnumerator();
+        }
+
+        IEnumerator<T> IEnumerable<T>.GetEnumerator()
         {
-        }        
+            return (IEnumerator<T>)this.Inner.GetEnumerator();
+        }
     }
 }

Community.Data.OData.Linq/ODataQuery.cs

@@ -1,41 +1,12 @@
 namespace Community.OData.Linq
 {
     using System;
-    using System.Collections;
-    using System.Collections.Generic;
     using System.Linq;
-    using System.Linq.Expressions;
 
-    using Microsoft.Extensions.DependencyInjection;
-    using Microsoft.OData.Edm;
-
-    public class ODataQuery<T> : IQueryable<T>, IOrderedQueryable<T>
+    public class ODataQueryOrdered<T> : ODataQuery<T>, IOrderedQueryable<T>
     {
-        public ODataQuery(IQueryable inner, IServiceProvider serviceProvider)
-        {
-            this.Inner = inner ?? throw new ArgumentNullException(nameof(inner));
-            this.ServiceProvider = serviceProvider;
-        }
-
-        public IEdmModel EdmModel => this.ServiceProvider.GetRequiredService<IEdmModel>();
-
-        public Type ElementType => this.Inner.ElementType;
-
-        public Expression Expression => this.Inner.Expression;
-
-        public IQueryProvider Provider => this.Inner.Provider;
-
-        public IQueryable Inner { get; }
-        public IServiceProvider ServiceProvider { get; }
-
-        public IEnumerator GetEnumerator()
-        {
-            return this.Inner.GetEnumerator();
-        }
-
-        IEnumerator<T> IEnumerable<T>.GetEnumerator()
+        internal ODataQueryOrdered(IOrderedQueryable inner, IServiceProvider serviceProvider):base(inner,serviceProvider)
         {
-            return (IEnumerator<T>)this.Inner.GetEnumerator();
-        }
+        }        
     }
 }

Community.Data.OData.Linq/ODataQueryOrdered.cs

@@ -55,13 +55,23 @@ public static class ODataLinqExtensions
         /// </returns>
         public static ODataQuery<T> OData<T>(this IQueryable<T> query, Action<ODataSettings> configuration = null, IEdmModel edmModel = null)
         {
+            if (query == null) throw new ArgumentNullException(nameof(query));
+
             if (edmModel == null)
-            {
+            {                
                 ODataConventionModelBuilder builder = new ODataConventionModelBuilder();
                 builder.AddEntityType(typeof(T));
                 builder.AddEntitySet(typeof(T).Name, new EntityTypeConfiguration(new ODataModelBuilder(), typeof(T)));
                 edmModel = builder.GetEdmModel();
             }
+            else
+            {
+                if (edmModel.SchemaElements.Count(e => e.SchemaElementKind == EdmSchemaElementKind.EntityContainer) == 0)
+                {
+                    throw new ArgumentException("Provided Entity Model have no IEdmEntityContainer", nameof(edmModel));
+
+                }
+            }
 
             ODataSettings settings = new ODataSettings();
             configuration?.Invoke(settings);
@@ -83,6 +93,9 @@ public static ODataQuery<T> OData<T>(this IQueryable<T> query, Action<ODataSetti
 
         public static ODataQuery<T> Filter<T>(this ODataQuery<T> query, string filterText, string entitySetName = null)
         {
+            if (query == null) throw new ArgumentNullException(nameof(query));
+            if (filterText == null) throw new ArgumentNullException(nameof(filterText));
+
             IEdmModel edmModel = query.EdmModel;
 
             ODataQueryOptionParser queryOptionParser = GetParser(query, entitySetName,
@@ -110,6 +123,9 @@ public static ODataQuery<T> Filter<T>(this ODataQuery<T> query, string filterTex
 
         public static IOrderedQueryable<T> OrderBy<T>(this ODataQuery<T> query, string orderbyText, string entitySetName = null)
         {
+            if (query == null) throw new ArgumentNullException(nameof(query));
+            if (orderbyText == null) throw new ArgumentNullException(nameof(orderbyText));
+
             IEdmModel edmModel = query.EdmModel;
 
             ODataQueryOptionParser queryOptionParser = GetParser(query, entitySetName,
@@ -132,8 +148,6 @@ public static IOrderedQueryable<T> OrderBy<T>(this ODataQuery<T> query, string o
 
         private static IOrderedQueryable OrderApplyToCore<T>(ODataQuery<T> query, ODataQuerySettings querySettings, ICollection<OrderByNode> nodes, IEdmModel model)
         {            
-            
-
             bool alreadyOrdered = false;
             IQueryable querySoFar = query;
 
@@ -240,11 +254,32 @@ private static ODataQueryOptionParser GetParser<T>(ODataQuery<T> query,string en
                 entitySetName = typeof(T).Name;
             }
 
-            IEdmEntityContainer container =
-                (IEdmEntityContainer)edmModel.SchemaElements.Single(
-                    e => e.SchemaElementKind == EdmSchemaElementKind.EntityContainer);
+            IEdmEntityContainer[] containers =
+                edmModel.SchemaElements.Where(
+                        e => e.SchemaElementKind == EdmSchemaElementKind.EntityContainer &&
+                             (e as IEdmEntityContainer).FindEntitySet(entitySetName) != null)
+                    .OfType<IEdmEntityContainer>()
+                    .ToArray();
+
+            if (containers.Length == 0)
+            {
+                throw new ArgumentException($"Unable to find {entitySetName} entity set in the model.",
+                    nameof(entitySetName));
+            }
+
+            if (containers.Length > 1)
+            {
+                throw new ArgumentException($"Entity Set {entitySetName} found more that 1 time",
+                    nameof(entitySetName));
+            }
+
+            IEdmEntitySet entitySet = containers.Single().FindEntitySet(entitySetName);
+
+            if (entitySet == null)
+            {
+                
+            }
 
-            IEdmEntitySet entitySet = container.FindEntitySet(entitySetName);
             ODataPath path = new ODataPath(new EntitySetSegment(entitySet));
 
             return new ODataQueryOptionParser(

Community.Data.OData.Linq/OdataLinqExtensions.cs

@@ -1,7 +1,7 @@
 MIT License
 
 Copyright (c) 2018 Microsoft. All rights reserved.
-Modification Copyright (c) 2018 IharYakimush
+Modification Copyright (c) 2018 Ihar Yakimush
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal