resolve conflict

ZEXSM · Jul 1, 2024 · 011e978 · 011e978
2 parents eb69a1b + e3549b9
commit 011e978
Show file tree

Hide file tree

Showing 7 changed files with 77 additions and 44 deletions.
diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml
@@ -6,6 +6,7 @@ on:
   pull_request:
 env:
   DOTNET_VERSION: '3.1.x'
+  CONFIGURATION: 'Release'
 jobs:
   ci:
     name: build&test&coverage(${{matrix.os}})
@@ -22,19 +23,17 @@ jobs:
         with:
           dotnet-version: ${{ env.DOTNET_VERSION }}
       - name: Build
-        run: dotnet build -c ${{ vars.CONFIGURATION }}
-      - name: Test
-        run: dotnet test -c ${{ vars.CONFIGURATION }} --no-build
+        run: dotnet build -c ${{ env.CONFIGURATION }}
       - name: Coveralls
         run: |
             dotnet minicover instrument
             dotnet minicover reset
-            dotnet test -c ${{ vars.CONFIGURATION }} --no-build
+            dotnet test -c ${{ env.CONFIGURATION }} --no-build
             dotnet minicover uninstrument
             dotnet minicover report
             dotnet minicover coverallsreport --service-name "github" \
                 --service-job-id ${{ github.run_id }} \
-                --repo-token ${{ secrets.COVERALLS_REPO_TOKEN }} \
+                --repo-token JiOZl3ryPk0SlG6xKgZny4u3TYxmeKJee \
                 --branch ${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}} \
                 --commit ${{ github.sha }}
   cd:
@@ -64,7 +63,7 @@ jobs:
             echo "release_package_version=$PACKAGE_VERSION" >> "$GITHUB_OUTPUT"
             echo $PACKAGE_VERSION
       - name: Pack
-        run: dotnet pack -c ${{ vars.CONFIGURATION }} -p:PackageVersion=${{ steps.create_tag.outputs.release_package_version }}
+        run: dotnet pack -c ${{ env.CONFIGURATION }} -p:PackageVersion=${{ steps.create_tag.outputs.release_package_version }}
       - name: Release
         env:
             GH_TOKEN: ${{ secrets.ACCSESS_TOKEN }}

diff --git a/.gitignore b/.gitignore
@@ -9,7 +9,7 @@
 *.userosscache
 *.sln.docstates
 
-# User-specific files (MonoDevelop/Xamarin Studio)
+# User-specific files (MonoDevelop/Xamarin Studio) 
 *.userprefs
 
 # Build results

diff --git a/src/OData.QueryBuilder/Attributes/ODataPropertyNameAttribute.cs b/src/OData.QueryBuilder/Attributes/ODataPropertyNameAttribute.cs
@@ -0,0 +1,15 @@
+using System;
+
+namespace OData.QueryBuilder.Attributes
+{
+    [AttributeUsage(AttributeTargets.Field | AttributeTargets.Property, AllowMultiple = false)]
+    public class ODataPropertyNameAttribute : Attribute
+    {
+        public string Name;
+
+        public ODataPropertyNameAttribute(string name)
+        {
+            Name = name;
+        }
+    }
+}
diff --git a/src/OData.QueryBuilder/Expressions/Visitors/ODataExpressionVisitor.cs b/src/OData.QueryBuilder/Expressions/Visitors/ODataExpressionVisitor.cs
@@ -2,6 +2,8 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq.Expressions;
+using System.Reflection;
+using OData.QueryBuilder.Attributes;
 
 namespace OData.QueryBuilder.Expressions.Visitors
 {
@@ -84,15 +86,22 @@ protected virtual string VisitMemberExpression(LambdaExpression topExpression, M
         {
             var memberName = VisitExpression(topExpression, memberExpression.Expression);
 
+            var reflectedMemberName = memberExpression.Member.Name;
+            var propertyNameAttribute = memberExpression.Member.GetCustomAttribute<ODataPropertyNameAttribute>();
+            if (propertyNameAttribute != null)
+            {
+                reflectedMemberName = propertyNameAttribute.Name;
+            }
+
             if (string.IsNullOrEmpty(memberName))
             {
-                return memberExpression.Member.Name;
+                return reflectedMemberName;
             }
 
             return memberExpression.Member.DeclaringType.IsNullableType() ?
                 memberName
                 :
-                $"{memberName}/{memberExpression.Member.Name}";
+                $"{memberName}/{reflectedMemberName}";
         }
 
         public virtual string ToString(LambdaExpression expression) =>

diff --git a/test/OData.QueryBuilder.Fakes/OData.QueryBuilder.Fakes.csproj b/test/OData.QueryBuilder.Fakes/OData.QueryBuilder.Fakes.csproj
@@ -3,4 +3,8 @@
 		<TargetFramework>netstandard2.0</TargetFramework>
 		<IsPackable>false</IsPackable>
 	</PropertyGroup>
-</Project>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\OData.QueryBuilder\OData.QueryBuilder.csproj" />
+  </ItemGroup>
+</Project>
diff --git a/test/OData.QueryBuilder.Fakes/ODataKindEntity.cs b/test/OData.QueryBuilder.Fakes/ODataKindEntity.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using OData.QueryBuilder.Attributes;
 
 namespace OData.QueryBuilder.Fakes
 {
@@ -23,5 +24,8 @@ public class ODataKindEntity
         public long[] SequenceLongArray { get; set; }
 
         public ColorEnum Color { get; set; }
+
+        [ODataPropertyName("customName")]
+        public string CustomNamedProperty { get; set; }
     }
 }
diff --git a/test/OData.QueryBuilder.Test/ODataQueryCollectionTest.cs b/test/OData.QueryBuilder.Test/ODataQueryCollectionTest.cs
@@ -45,8 +45,8 @@ public void ODataQueryBuilderList_Expand_DynamicProperty_Success()
                 .ToUri();
 
             uri.Should().Be("http://mock/odata/ODataType?$expand=ODataKind");
-        }
-
+        }
+
         [Fact(DisplayName = "Select simple => Success")]
         public void ODataQueryBuilderList_Select_Simple_Success()
         {
@@ -69,8 +69,8 @@ public void ODataQueryBuilderList_Select_DynamicProperty_Success()
                 .ToUri();
 
             uri.Should().Be("http://mock/odata/ODataType?$select=IdType");
-        }
-
+        }
+
         [Fact(DisplayName = "OrderBy simple => Success")]
         public void ODataQueryBuilderList_OrderBy_Simple_Success()
         {
@@ -93,8 +93,8 @@ public void ODataQueryBuilderList_OrderBy_DynamicProperty_Success()
                 .ToUri();
 
             uri.Should().Be("http://mock/odata/ODataType?$orderby=IdType asc");
-        }
-
+        }
+
         [Fact(DisplayName = "Filter orderBy multiple sort => Success")]
         public void ODataQueryBuilderList_Filter_OrderBy_Multiple_Sort_Success()
         {
@@ -354,8 +354,8 @@ public void ODataQueryBuilderList_Filter_With_ReplaceCharacters_KeyValuePairs_Ar
         [Fact(DisplayName = "Filter variable dynamic property int=> Success")]
         public void ODataQueryBuilderList_Filter_Simple_Variable_DynamicProperty_Success()
         {
-            string propertyName = "ODataKind.ODataCode.IdCode";
-
+            string propertyName = "ODataKind.ODataCode.IdCode";
+
             var uri = _odataQueryBuilderDefault
                 .For<ODataTypeEntity>(s => s.ODataType)
                 .ByList()
@@ -376,8 +376,8 @@ public void ODataQueryBuilderList_Filter_Simple_Variable_DynamicProperty_WrongTy
                     .ByList()
                     .Filter((s, f, _) => ODataProperty.FromPath<string>(propertyName) == "test")
                     .ToUri()).Should().Throw<ArgumentException>();
-        }
-
+        }
+
         [Fact(DisplayName = "Filter const dynamic property int=> Success")]
         public void ODataQueryBuilderList_Filter_Simple_Const_DynamicProperty_Success()
         {
@@ -388,8 +388,8 @@ public void ODataQueryBuilderList_Filter_Simple_Const_DynamicProperty_Success()
                 .ToUri();
 
             uri.Should().Be("http://mock/odata/ODataType?$filter=ODataKind/ODataCode/IdCode ge 3");
-        }
-
+        }
+
         [Fact(DisplayName = "Filter simple const int=> Success")]
         public void ODataQueryBuilderList_Filter_Simple_Const_Int_Success()
         {
@@ -576,6 +576,7 @@ public void ODataQueryBuilderList_Function_Date_Success()
                     && s.ODataKind.OpenDate == currentDateToday
                     && s.ODataKind.OpenDate == DateTime.Today
                     && s.ODataKind.OpenDate == new DateTimeOffset()
+                    && s.ODataKind.CustomNamedProperty == "test"
                     && s.Open == new DateTime()
                     && f.Date(s.Open) == DateTime.Today
                     && f.Date(s.Open) == DateTimeOffset.Now
@@ -592,6 +593,7 @@ public void ODataQueryBuilderList_Function_Date_Success()
                 $"and ODataKind/OpenDate eq 2019-02-09T00:00:00Z " +
                 $"and ODataKind/OpenDate eq {DateTime.Today:s}Z " +
                 $"and ODataKind/OpenDate eq {new DateTimeOffset():s}Z " +
+                $"and ODataKind/customName eq 'test' " +
                 $"and Open eq {new DateTime():s}Z " +
                 $"and date(Open) eq {DateTime.Today:s}Z " +
                 $"and date(Open) eq {DateTimeOffset.Now:s}Z " +
@@ -1560,39 +1562,39 @@ public void ODataQueryBuilder_Function_Cast_Skip_Exception(string value)
                 .ToUri();
 
             uri.Should().Be("http://mock/odata/ODataType?$filter=contains(,'55')");
-        }
-
+        }
+
         [Fact(DisplayName = "UseCorrectDateTimeFormat Convert => Success")]
         public void ODataQueryBuilderList_UseCorrectDatetimeFormat_Convert_Success()
-        {
-            var builder = new ODataQueryBuilder<ODataInfoContainer>(
-                 _commonFixture.BaseUri,
-                 new ODataQueryBuilderOptions { UseCorrectDateTimeFormat = true });
-
-            var dateTimeLocal = new DateTime(
-                year: 2023, month: 04, day: 07, hour: 12, minute: 30, second: 20, kind: DateTimeKind.Local);
-            var dateTimeUtc = new DateTime(
-                year: 2023, month: 04, day: 07, hour: 12, minute: 30, second: 20, kind: DateTimeKind.Utc);
-            var dateTimeOffset = new DateTimeOffset(
-                year: 2023, month: 04, day: 07, hour: 12, minute: 30, second: 20, offset: TimeSpan.FromHours(+7));
-            var dateTimeOffset2 = new DateTimeOffset(
-                year: 2023, month: 04, day: 07, hour: 12, minute: 30, second: 20, offset: TimeSpan.FromHours(-7));
+        {
+            var builder = new ODataQueryBuilder<ODataInfoContainer>(
+                 _commonFixture.BaseUri,
+                 new ODataQueryBuilderOptions { UseCorrectDateTimeFormat = true });
+
+            var dateTimeLocal = new DateTime(
+                year: 2023, month: 04, day: 07, hour: 12, minute: 30, second: 20, kind: DateTimeKind.Local);
+            var dateTimeUtc = new DateTime(
+                year: 2023, month: 04, day: 07, hour: 12, minute: 30, second: 20, kind: DateTimeKind.Utc);
+            var dateTimeOffset = new DateTimeOffset(
+                year: 2023, month: 04, day: 07, hour: 12, minute: 30, second: 20, offset: TimeSpan.FromHours(+7));
+            var dateTimeOffset2 = new DateTimeOffset(
+                year: 2023, month: 04, day: 07, hour: 12, minute: 30, second: 20, offset: TimeSpan.FromHours(-7));
             var nowOffset = $"{DateTimeOffset.Now:zzz}".Replace("+", "%2B");
 
             var uri = builder
                 .For<ODataTypeEntity>(s => s.ODataType)
                 .ByList()
-                .Filter((o) =>
-                    o.DateTime == dateTimeLocal
-                    && o.DateTime == dateTimeUtc
-                    && o.DateTime == dateTimeOffset
+                .Filter((o) =>
+                    o.DateTime == dateTimeLocal
+                    && o.DateTime == dateTimeUtc
+                    && o.DateTime == dateTimeOffset
                     && o.DateTime == dateTimeOffset2)
                 .ToUri();
 
             uri.Should().Be($"http://mock/odata/ODataType?$filter=" +
-                $"DateTime eq 2023-04-07T12:30:20{nowOffset} and " +
-                $"DateTime eq 2023-04-07T12:30:20%2B00:00 and " +
-                $"DateTime eq 2023-04-07T12:30:20%2B07:00 and " +
+                $"DateTime eq 2023-04-07T12:30:20{nowOffset} and " +
+                $"DateTime eq 2023-04-07T12:30:20%2B00:00 and " +
+                $"DateTime eq 2023-04-07T12:30:20%2B07:00 and " +
                 $"DateTime eq 2023-04-07T12:30:20-07:00");
         }