refactored

01-Core/Jinget.Core/ExpressionToSql/Internal/OrderBy.cs

@@ -1,7 +1,4 @@
-using Jinget.Core.ExtensionMethods.Expressions;
-using Jinget.Core.Utilities.Expressions;
-
-namespace Jinget.Core.ExpressionToSql.Internal;
+namespace Jinget.Core.ExpressionToSql.Internal;
 
 /// <summary>
 /// Provides the order by functionality used in query handling

01-Core/Jinget.Core/ExpressionToSql/Internal/Select.cs

@@ -1,5 +1,3 @@
-using Jinget.Core.ExtensionMethods.Reflection;
-
 namespace Jinget.Core.ExpressionToSql.Internal;
 
 public class Select<T, R> : Query

01-Core/Jinget.Core/ExpressionToSql/Internal/Where.cs

@@ -1,5 +1,3 @@
-using Jinget.Core.Exceptions;
-
 #pragma warning disable CS8604 // Possible null reference argument.
 namespace Jinget.Core.ExpressionToSql.Internal;
 

01-Core/Jinget.Core/ExtensionMethods/Collections/IQueryableExtensions.cs

@@ -1,6 +1,4 @@
-using Jinget.Core.Exceptions;
-
-namespace Jinget.Core.ExtensionMethods.Collections;
+namespace Jinget.Core.ExtensionMethods.Collections;
 
 public static class IQueryableExtensions
 {

01-Core/Jinget.Core/ExtensionMethods/Database/SqlClient/IDbConnectionExtensions.cs

@@ -1,7 +1,6 @@
 using Jinget.Core.Contracts;
 using Jinget.Core.ExtensionMethods.ExpressionToSql;
 using Jinget.Core.ExtensionMethods.Collections;
-using Jinget.Core.ExtensionMethods.Reflection;
 
 [assembly: InternalsVisibleTo("Jinget.Core.Tests")]
 namespace Jinget.Core.ExtensionMethods.Database.SqlClient;

01-Core/Jinget.Core/ExtensionMethods/ExpressionToSql/PagingExtensions.cs

@@ -1,6 +1,4 @@
-using Jinget.Core.Exceptions;
-
-namespace Jinget.Core.ExtensionMethods.ExpressionToSql;
+namespace Jinget.Core.ExtensionMethods.ExpressionToSql;
 
 public static class PagingExtensions
 {

01-Core/Jinget.Core/ExtensionMethods/Expressions/BooleanExpressionExtensions.cs

@@ -1,6 +1,4 @@
-using Jinget.Core.Utilities.Expressions;
-
-namespace Jinget.Core.ExtensionMethods.Expressions;
+namespace Jinget.Core.ExtensionMethods.Expressions;
 
 public static class BooleanExpressionExtensions
 {
@@ -13,8 +11,10 @@ public static class BooleanExpressionExtensions
     /// <summary>
     /// Visit a boolean expression
     /// </summary>
-    private static (Expression? LeftExpression, Expression? RightExpression) Visit<T>(Expression<Func<T, bool>> leftExpression,
-        Expression<Func<T, bool>> rightExpression, ParameterExpression parameter)
+    private static (Expression? LeftExpression, Expression? RightExpression) Visit<T>(
+        Expression<Func<T, bool>> leftExpression,
+        Expression<Func<T, bool>> rightExpression,
+        ParameterExpression parameter)
     {
         ReplaceExpressionVisitor leftVisitor = new(leftExpression.Parameters[0], parameter);
         Expression? left = leftVisitor.Visit(leftExpression.Body);
@@ -29,31 +29,41 @@ public static class BooleanExpressionExtensions
     /// should combine conditions using AND operator. if any of expressions passed as null, then the other expression will be returned
     /// </summary>
     /// <param name="parameterName">parameter name used in expression. for example in x=>x.Id>0, parameterName is 'x'</param>
-    public static Expression<Func<T, bool>> AndAlso<T>(this Expression<Func<T, bool>> expr1, Expression<Func<T, bool>> expr2, string parameterName = "Param_0")
-    {
-        if (expr1 is null) return expr2;
-        if (expr2 is null) return expr1;
-        var parameter = Expression.Parameter(typeof(T), parameterName);
-
-        (Expression? LeftExpression, Expression? RightExpression) = Visit(expr1, expr2, parameter);
-#pragma warning disable CS8604 // Possible null reference argument.
-        return Expression.Lambda<Func<T, bool>>(Expression.AndAlso(LeftExpression, RightExpression), parameter);
-#pragma warning restore CS8604 // Possible null reference argument.
-    }
+    public static Expression<Func<T, bool>> AndAlso<T>(
+        this Expression<Func<T, bool>> expr1,
+        Expression<Func<T, bool>> expr2,
+        string parameterName = "Param_0")
+        => expr1.CreateBinaryExpression(expr2, parameterName, ExpressionType.AndAlso);
 
     /// <summary>
     /// should combine conditions using OR operator. if any of expressions passed as null, then the other expression will be returned
     /// </summary>
     /// <param name="parameterName">parameter name used in expression. for example in x=>x.Id>0, parameterName is 'x'</param>
-    public static Expression<Func<T, bool>> OrElse<T>(this Expression<Func<T, bool>> expr1, Expression<Func<T, bool>> expr2, string parameterName = "Param_0")
+    public static Expression<Func<T, bool>> OrElse<T>(
+        this Expression<Func<T, bool>> expr1,
+        Expression<Func<T, bool>> expr2,
+        string parameterName = "Param_0")
+        => expr1.CreateBinaryExpression(expr2, parameterName, ExpressionType.OrElse);
+
+    static Expression<Func<T, bool>> CreateBinaryExpression<T>(
+        this Expression<Func<T, bool>> expr1,
+        Expression<Func<T, bool>> expr2,
+        string parameterName = "Param_0",
+        ExpressionType expressionType = ExpressionType.AndAlso)
     {
         if (expr1 is null) return expr2;
         if (expr2 is null) return expr1;
         var parameter = Expression.Parameter(typeof(T), parameterName);
-
         (Expression? LeftExpression, Expression? RightExpression) = Visit(expr1, expr2, parameter);
-#pragma warning disable CS8604 // Possible null reference argument.
-        return Expression.Lambda<Func<T, bool>>(Expression.OrElse(LeftExpression, RightExpression), parameter);
-#pragma warning restore CS8604 // Possible null reference argument.
+        BinaryExpression binaryExpr;
+        if (expressionType == ExpressionType.AndAlso)
+            binaryExpr = Expression.AndAlso(LeftExpression, RightExpression);
+        else if (expressionType == ExpressionType.OrElse)
+            binaryExpr = Expression.OrElse(LeftExpression, RightExpression);
+        else
+            throw new Exception("Jinget Says: Only AndAlso and OrElse are supported");
+
+        return Expression.Lambda<Func<T, bool>>(binaryExpr, parameter);
     }
+
 }

01-Core/Jinget.Core/ExtensionMethods/Expressions/ExpressionExtensions.cs

@@ -1,6 +1,4 @@
-using Jinget.Core.Utilities.Expressions;
-
-namespace Jinget.Core.ExtensionMethods.Expressions;
+namespace Jinget.Core.ExtensionMethods.Expressions;
 
 public static class ExpressionExtensions
 {

01-Core/Jinget.Core/ExtensionMethods/Expressions/LambdaExpressionExtensions.cs

@@ -1,6 +1,4 @@
-using Jinget.Core.Utilities.Expressions;
-
-namespace Jinget.Core.ExtensionMethods.Expressions;
+namespace Jinget.Core.ExtensionMethods.Expressions;
 
 public static class LambdaExpressionExtensions
 {

01-Core/Jinget.Core/ExtensionMethods/Generics/GenericTypeExtensions.cs

@@ -9,7 +9,6 @@ public static class GenericTypeExtensions
     public static bool IsSubclassOfRawGeneric(this Type derivedType, Type parentType)
     {
         while (derivedType != null && derivedType != typeof(object))
-
         {
             var currentType = derivedType.IsGenericType ? derivedType.GetGenericTypeDefinition() : derivedType;
             if (parentType == currentType)

01-Core/Jinget.Core/ExtensionMethods/ObjectExtensions.cs

@@ -1,8 +1,4 @@
-using Jinget.Core.Exceptions;
-using Jinget.Core.ExtensionMethods.Reflection;
-using Newtonsoft.Json;
-
-namespace Jinget.Core.ExtensionMethods;
+namespace Jinget.Core.ExtensionMethods;
 
 public static class ObjectExtensions
 {
@@ -48,13 +44,13 @@ TypeCode.Double or
         foreach (PropertyDescriptor property in TypeDescriptor.GetProperties(source))
         {
             object? value = property.GetValue(source);
-            if (options.IgnoreNull && value == null)
-                continue;
-            else if (options.IgnoreExpressions && value is Expression)
-                continue;
-            else if (options.IgnoreExpr2SQLOrderBys && value is List<OrderBy>)
-                continue;
-            else if (options.IgnoreExpr2SQLPagings && value is Paging)
+            var valueType = value.GetType();
+            if (
+                (options.IgnoreNull && value == null) ||
+                (options.IgnoreExpressions && value is Expression) ||
+                (options.IgnoreExpr2SQLOrderBys && value is List<OrderBy>) ||
+                (options.IgnoreExpr2SQLOrderBys && value is not null && valueType.IsGenericType && valueType.GenericTypeArguments[0].GetGenericTypeDefinition() == typeof(OrderBy<>)) ||
+                (options.IgnoreExpr2SQLPagings && value is Paging))
                 continue;
             string key = property.Name;
             if (!result.ContainsKey(key))
@@ -69,8 +65,7 @@ TypeCode.Double or
     /// <summary>
     /// Get the value of the given property
     /// </summary>
-    public static object? GetValue(this object obj, string propertyName)
-        => obj.GetType().GetProperty(propertyName)?.GetValue(obj);
+    public static object? GetValue(this object obj, string propertyName) => obj.GetType().GetProperty(propertyName)?.GetValue(obj);
 
     /// <summary>
     /// Convert two unrelated objects to each other.

01-Core/Jinget.Core/ExtensionMethods/Reflection/TypeExtensions.cs

@@ -1,7 +1,4 @@
-using Jinget.Core.Exceptions;
-using Jinget.Core.ExtensionMethods.Expressions;
-
-namespace Jinget.Core.ExtensionMethods.Reflection;
+namespace Jinget.Core.ExtensionMethods.Reflection;
 
 public static class TypeExtensions
 {

01-Core/Jinget.Core/GlobalUsings.cs

@@ -7,16 +7,21 @@
 global using Microsoft.CodeAnalysis.Text;
 global using Microsoft.CodeAnalysis;
 global using Microsoft.CSharp;
+global using Jinget.Core.ExtensionMethods.Expressions;
 global using Microsoft.Extensions.DependencyInjection;
 global using System.CodeDom.Compiler;
 global using System.CodeDom;
 global using System.Collections.Generic;
+global using Jinget.Core.Utilities.Expressions;
 global using System.Collections;
 global using System.ComponentModel.DataAnnotations;
 global using System.ComponentModel;
 global using System.Data;
 global using System.IO;
 global using System.Linq.Expressions;
+global using Jinget.Core.Exceptions;
+global using Jinget.Core.ExtensionMethods.Reflection;
+global using Newtonsoft.Json;
 global using System.Linq;
 global using System.Reflection;
 global using System.Runtime.CompilerServices;

01-Core/Jinget.Core/Security/AES/AESManager.cs

@@ -1,5 +1,4 @@
 using System.Security.Cryptography;
-using Jinget.Core.Exceptions;
 
 namespace Jinget.Core.Security.AES;
 

01-Core/Jinget.Core/Security/Hashing/HashManager.cs

@@ -1,5 +1,4 @@
 using System.Security.Cryptography;
-using Jinget.Core.Exceptions;
 using Jinget.Core.Security.Hashing.Model;
 using Microsoft.AspNetCore.Cryptography.KeyDerivation;
 

01-Core/Jinget.Core/Utilities/Expressions/ExpressionUtility.cs

@@ -1,7 +1,4 @@
-using Jinget.Core.Exceptions;
-using Jinget.Core.ExtensionMethods.Reflection;
-using Jinget.Core.Types;
-using Newtonsoft.Json;
+using Jinget.Core.Types;
 using Jinget.Core.ExtensionMethods.Collections;
 
 namespace Jinget.Core.Utilities.Expressions;

01-Core/Jinget.Core/Utilities/Json/IgnorePropertiesResolver.cs

@@ -1,5 +1,4 @@
 using Newtonsoft.Json.Serialization;
-using Newtonsoft.Json;
 
 namespace Jinget.Core.Utilities.Json;
 

01-Core/Jinget.Core/Utilities/Json/NonPublicSetterResolver.cs

@@ -1,5 +1,4 @@
-using Newtonsoft.Json;
-using Newtonsoft.Json.Serialization;
+using Newtonsoft.Json.Serialization;
 
 namespace Jinget.Core.Utilities.Json;
 

04-Presentation/Jinget.Blazor/Components/Picker/SelectedDateRangeModel.cs

@@ -1,6 +1,4 @@
-using MudBlazor;
-
-namespace Jinget.Blazor.Components.Picker;
+namespace Jinget.Blazor.Components.Picker;
 
 public class SelectedDateRangeModel
 {

Tests/Jinget.Core.Tests/_BaseData/Message.cs

@@ -1,10 +1,6 @@
 using Jinget.Core.Contracts;
 using Jinget.Core.ExpressionToSql.Internal;
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Jinget.Core.Tests._BaseData
 {
@@ -18,14 +14,13 @@ public GenericRequestSampleMessage()
                 PageNumber = 1,
                 PageSize = 10,
             };
-            OrderBy = new List<OrderBy<GenericRequestSampleMessage>>()
-        {
-            new()
+            OrderBy = [
+            new OrderBy<GenericRequestSampleMessage>()
             {
                 Name = x=>x.Property1,
                 Direction=Enumerations.OrderByDirection.Descending
             }
-        };
+        ];
         }
         public string Property1 { get; set; }
         public string Property2 { get; set; }

Tests/Jinget.Core.Tests/_BaseData/Sample.cs

@@ -1,5 +1,4 @@
-using Microsoft.CodeAnalysis.CSharp.Syntax;
-using System;
+using System;
 using System.Collections.Generic;
 
 namespace Jinget.Core.Tests._BaseData;