From 376c860cb3db3aa75305270bdb057d37b2f17f55 Mon Sep 17 00:00:00 2001
From: Sam Xu <saxu@microsoft.com>
Date: Thu, 19 Jan 2023 12:36:11 -0800
Subject: [PATCH 1/2] fixes #812: Enable
 EnableReadingODataAnnotationWithoutPrefix by default, add samples for nested
 DeltaDeletedResource

---
 .../Controllers/v1/OrganizationsController.cs | 69 +++++++++++++++++++
 .../Abstracts/ContainerBuilderExtensions.cs   |  5 ++
 .../Microsoft.AspNetCore.OData.xml            | 14 ++++
 3 files changed, 88 insertions(+)

diff --git a/sample/ODataRoutingSample/Controllers/v1/OrganizationsController.cs b/sample/ODataRoutingSample/Controllers/v1/OrganizationsController.cs
index f7ab26325..0bfa6be79 100644
--- a/sample/ODataRoutingSample/Controllers/v1/OrganizationsController.cs
+++ b/sample/ODataRoutingSample/Controllers/v1/OrganizationsController.cs
@@ -5,6 +5,7 @@
 // </copyright>
 //------------------------------------------------------------------------------
 
+using System.Collections.Generic;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.OData.Deltas;
 using Microsoft.AspNetCore.OData.Formatter;
@@ -93,6 +94,74 @@ public IActionResult Patch(DeltaSet<Organization> changes)
             return Ok();
         }
 
+        [HttpPatch]
+        [EnableQuery]
+        public IActionResult Patch(int key, Delta<Organization> delta)
+        {
+            /* Send a PATCH request to: http://localhost:5000/v1/Organizations/1
+             * using the following payload (v4.01 format, should enable the EnableReadingODataAnnotationWithoutPrefix on ODataSimplifiedOptions)
+{
+   "Departs@delta": [
+    {
+     "@removed":{"reason":"deleted" },
+     "@id":"Departments(13)"
+    },
+    {
+      "@id":"Departments(42)",
+      "Name":"Microsoft"
+   }
+  ]
+}
+     */
+
+            // Or using the following payload (v4.0 format)
+            /*
+{
+   "Departs@delta": [
+    {
+     "@odata.context":"http://localhost:5000/v1/$metadata#Departments/$deletedEntity",
+     "id":"Departments(13)",
+     "reason":"deleted"
+    },
+    {
+      "@odata.id":"Departments(42)",
+      "Name":"Microsoft"
+   }
+  ]
+}
+
+            Be noted: the "id" should go before "reason", otherwise we can't read the "id" value.
+            It's a bug in ODL side.
+             */
+
+            if (delta != null && delta.TryGetPropertyValue("Departs", out object value))
+            {
+                if (value is DeltaSet<Department> departs)
+                {
+                    IList<string> sb = new List<string>();
+                    foreach (var setItem in departs)
+                    {
+                        if (setItem is IDeltaDeletedResource deletedResource)
+                        {
+                            sb.Add($"   |-> A DeletedResource Id = {deletedResource.Id}");
+                        }
+                        else if (setItem is IDelta deltaResource)
+                        {
+                            sb.Add($"   |-> A Delta Resource With ChangedProperties = {string.Join(",", deltaResource.GetChangedPropertyNames())}");
+                        }
+                        else
+                        {
+                            sb.Add($"   |-> Not fully supported: {setItem.Kind}");
+                        }
+                    }
+
+                    return Ok(sb);
+                }
+            }
+
+            return Ok();
+        }
+
         public IActionResult GetName(int key)
         {
             Organization org = new Organization
diff --git a/src/Microsoft.AspNetCore.OData/Abstracts/ContainerBuilderExtensions.cs b/src/Microsoft.AspNetCore.OData/Abstracts/ContainerBuilderExtensions.cs
index 32fb1f41a..63e742668 100644
--- a/src/Microsoft.AspNetCore.OData/Abstracts/ContainerBuilderExtensions.cs
+++ b/src/Microsoft.AspNetCore.OData/Abstracts/ContainerBuilderExtensions.cs
@@ -57,6 +57,11 @@ public static IContainerBuilder AddDefaultWebApiServices(this IContainerBuilder
                 MessageQuotas = new ODataMessageQuotas { MaxReceivedMessageSize = Int64.MaxValue },
             });
 
+            builder.AddServicePrototype(new ODataSimplifiedOptions
+            {
+                EnableReadingODataAnnotationWithoutPrefix = true,
+            });
+
             // QueryValidators.
             builder.AddService<ICountQueryValidator, CountQueryValidator>(ServiceLifetime.Singleton);
 
diff --git a/src/Microsoft.AspNetCore.OData/Microsoft.AspNetCore.OData.xml b/src/Microsoft.AspNetCore.OData/Microsoft.AspNetCore.OData.xml
index d5a43a42a..8b856e5c4 100644
--- a/src/Microsoft.AspNetCore.OData/Microsoft.AspNetCore.OData.xml
+++ b/src/Microsoft.AspNetCore.OData/Microsoft.AspNetCore.OData.xml
@@ -1102,6 +1102,20 @@
             <param name="clrType">The type to test.</param>
             <returns>True if the type is a DateTime; false otherwise.</returns>
         </member>
+        <member name="M:Microsoft.AspNetCore.OData.Common.TypeHelper.IsDateOnly(System.Type)">
+            <summary>
+            Determine if a type is a <see cref="T:System.DateOnly"/>.
+            </summary>
+            <param name="clrType">The type to test.</param>
+            <returns>True if the type is a DateOnly; false otherwise.</returns>
+        </member>
+        <member name="M:Microsoft.AspNetCore.OData.Common.TypeHelper.IsTimeOnly(System.Type)">
+            <summary>
+            Determine if a type is a <see cref="T:System.TimeOnly"/>.
+            </summary>
+            <param name="clrType">The type to test.</param>
+            <returns>True if the type is a TimeOnly; false otherwise.</returns>
+        </member>
         <member name="M:Microsoft.AspNetCore.OData.Common.TypeHelper.IsTimeSpan(System.Type)">
             <summary>
             Determine if a type is a TimeSpan.

From 34f2b6abe3625698689da14db1dbca701c4dc79e Mon Sep 17 00:00:00 2001
From: Sam Xu <saxu@microsoft.com>
Date: Fri, 20 Jan 2023 00:16:52 -0800
Subject: [PATCH 2/2] Fix the failing test

---
 test/Microsoft.AspNetCore.OData.Tests/ODataOptionsTests.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/Microsoft.AspNetCore.OData.Tests/ODataOptionsTests.cs b/test/Microsoft.AspNetCore.OData.Tests/ODataOptionsTests.cs
index 5ec4a1b5c..97284f92a 100644
--- a/test/Microsoft.AspNetCore.OData.Tests/ODataOptionsTests.cs
+++ b/test/Microsoft.AspNetCore.OData.Tests/ODataOptionsTests.cs
@@ -141,7 +141,7 @@ public void AddRouteComponents_WithDependencyInjection_SetModelAndServices()
         }
 
         [Theory]
-        [InlineData(ODataVersion.V4, false)]
+        [InlineData(ODataVersion.V4, true)]
         [InlineData(ODataVersion.V401, true)]
         public void AddRouteComponents_WithVersionAndDependencyInjection_SetModelAndServices(ODataVersion version, bool readingODataPrefixSetting)
         {