From f77764c5b895e493ce8fc8a8bd11c7a82058f836 Mon Sep 17 00:00:00 2001
From: Andrew Omondi <andrew.omondi@microsoft.com>
Date: Wed, 4 Oct 2023 12:24:41 +0300
Subject: [PATCH 1/3] Fix for missing functions/actions on deletedItems

---
 transforms/csdl/preprocess_csdl.xsl           | 41 +++++++++++++++++++
 .../csdl/preprocess_csdl_test_input.xml       |  4 ++
 .../csdl/preprocess_csdl_test_output.xml      | 35 +++++++++++++++-
 3 files changed, 78 insertions(+), 2 deletions(-)

diff --git a/transforms/csdl/preprocess_csdl.xsl b/transforms/csdl/preprocess_csdl.xsl
index 8bf9071cb..90c97142c 100644
--- a/transforms/csdl/preprocess_csdl.xsl
+++ b/transforms/csdl/preprocess_csdl.xsl
@@ -346,6 +346,18 @@
                     <String>microsoft.graph.device</String>
                 </Collection>
             </Annotation>
+            <Annotation Term="Org.OData.Core.V1.ExplicitOperationBindings">
+                <Collection>
+                    <String>microsoft.graph.getByIds</String>
+                    <String>microsoft.graph.getAvailableExtensionProperties</String>
+                    <String>microsoft.graph.validateProperties</String>
+                    <String>microsoft.graph.restore</String>
+                    <String>microsoft.graph.getMemberObjects</String>
+                    <String>microsoft.graph.getMemberGroups</String>
+                    <String>microsoft.graph.checkMemberObjects</String>
+                    <String>microsoft.graph.checkMemberGroups</String>
+                </Collection>
+          </Annotation>
         </xsl:copy>
     </xsl:template>
     <xsl:template match="edm:Schema[@Namespace='microsoft.graph']/edm:EntityType[@Name='user']/edm:NavigationProperty[@Name='ownedDevices']|
@@ -541,6 +553,17 @@
        <xsl:attribute name="Type">Edm.Stream</xsl:attribute>
     </xsl:template>
 
+    <!-- Actions/Functions bound to  directoryObject should have the 'RequiresExplicitBinding' annotation-->
+    <xsl:template match="edm:Schema[@Namespace='microsoft.graph']/edm:Action[@IsBound='true'][edm:Parameter[@Type='graph.directoryObject']] |
+                         edm:Schema[@Namespace='microsoft.graph']/edm:Action[@IsBound='true'][edm:Parameter[@Type='Collection(graph.directoryObject)']] |
+                         edm:Schema[@Namespace='microsoft.graph']/edm:Function[@IsBound='true'][edm:Parameter[@Type='graph.directoryObject']] |
+                         edm:Schema[@Namespace='microsoft.graph']/edm:Function[@IsBound='true'][edm:Parameter[@Type='Collection(graph.directoryObject)']]">
+        <xsl:copy>
+            <xsl:copy-of select="@* | node()" />
+            <Annotation Term="Org.OData.Core.V1.RequiresExplicitBinding"/>
+        </xsl:copy>
+    </xsl:template>
+
     <!--Replace single-valued with collection-valued return types for complex type appliedConditionalAccessPolicy-->
     <xsl:template match="edm:Schema[@Namespace='microsoft.graph']/edm:ComplexType[@Name='appliedConditionalAccessPolicy']/edm:Property[@Name='conditionsNotSatisfied' or @Name='conditionsSatisfied']/@Type">
         <xsl:attribute name="Type">Collection(graph.conditionalAccessConditions)</xsl:attribute>
@@ -1962,6 +1985,24 @@
     <!-- Remove directoryObject Capability Annotations -->
     <xsl:template match="edm:Schema[starts-with(@Namespace, 'microsoft.graph')]/edm:Annotations[@Target='microsoft.graph.directoryObject']/*[starts-with(@Term, 'Org.OData.Capabilities')]"/>
 
+    <xsl:template match="edm:Schema[starts-with(@Namespace, 'microsoft.graph')]/edm:Annotations[@Target='microsoft.graph.directoryObject']">
+        <xsl:element name="Annotation">
+          <Annotation Term="Org.OData.Core.V1.ExplicitOperationBindings">
+            <Collection>
+                <String>microsoft.graph.getByIds</String>
+                <String>microsoft.graph.delta</String>
+                <String>microsoft.graph.getAvailableExtensionProperties</String>
+                <String>microsoft.graph.validateProperties</String>
+                <String>microsoft.graph.restore</String>
+                <String>microsoft.graph.getMemberObjects</String>
+                <String>microsoft.graph.getMemberGroups</String>
+                <String>microsoft.graph.checkMemberObjects</String>
+                <String>microsoft.graph.checkMemberGroups</String>
+            </Collection>
+          </Annotation>
+        </xsl:element>
+    </xsl:template>
+
     <!-- Add Referenceable Annotations (for /$ref paths) -->
     <xsl:template match="edm:Schema[@Namespace='microsoft.graph']/edm:EntityType[@Name='connectorGroup']/edm:NavigationProperty[@Name='members']|
                         edm:Schema[@Namespace='microsoft.graph']/edm:EntityType[@Name='educationClass']/edm:NavigationProperty[@Name='members']|
diff --git a/transforms/csdl/preprocess_csdl_test_input.xml b/transforms/csdl/preprocess_csdl_test_input.xml
index fe685d941..fd68ddecd 100644
--- a/transforms/csdl/preprocess_csdl_test_input.xml
+++ b/transforms/csdl/preprocess_csdl_test_input.xml
@@ -350,6 +350,10 @@
                 <Parameter Name="bindingparameter" Type="Collection(graph.event)" Nullable="false" />
                 <ReturnType Type="Collection(graph.event)" Nullable="false" />
             </Function>
+            <Function Name="delta" IsBound="true">
+                <Parameter Name="bindingparameter" Type="Collection(graph.directoryObject)" Nullable="false" />
+                <ReturnType Type="Collection(graph.directoryObject)" Nullable="false" />
+            </Function>
             <Action Name="accept" IsBound="true">
                 <Parameter Name="bindingParameter" Type="graph.event" />
                 <Parameter Name="SendResponse" Type="Edm.Boolean" />
diff --git a/transforms/csdl/preprocess_csdl_test_output.xml b/transforms/csdl/preprocess_csdl_test_output.xml
index 7c68c6ff9..6e3ce0d2c 100644
--- a/transforms/csdl/preprocess_csdl_test_output.xml
+++ b/transforms/csdl/preprocess_csdl_test_output.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <?xml-stylesheet type='text/xsl' href='preprocess_csdl.xsl'?>
 <edmx:Edmx Version="4.0" xmlns:edmx="http://docs.oasis-open.org/odata/ns/edmx">
   <edmx:DataServices>
@@ -358,6 +358,18 @@
               <String>microsoft.graph.device</String>
             </Collection>
           </Annotation>
+          <Annotation Term="Org.OData.Core.V1.ExplicitOperationBindings" xmlns:edm="http://docs.oasis-open.org/odata/ns/edm">
+            <Collection>
+              <String>microsoft.graph.getByIds</String>
+              <String>microsoft.graph.getAvailableExtensionProperties</String>
+              <String>microsoft.graph.validateProperties</String>
+              <String>microsoft.graph.restore</String>
+              <String>microsoft.graph.getMemberObjects</String>
+              <String>microsoft.graph.getMemberGroups</String>
+              <String>microsoft.graph.checkMemberObjects</String>
+              <String>microsoft.graph.checkMemberGroups</String>
+            </Collection>
+          </Annotation>
         </NavigationProperty>
       </EntityType>
       <EntityType Name="accessPackageCatalog" BaseType="graph.entity">
@@ -905,6 +917,11 @@
           </Record>
         </Annotation>
       </Function>
+      <Function Name="delta" IsBound="true">
+        <Parameter Name="bindingparameter" Type="Collection(graph.directoryObject)" Nullable="false" />
+        <ReturnType Type="Collection(graph.directoryObject)" Nullable="false" />
+        <Annotation Term="Org.OData.Core.V1.RequiresExplicitBinding" xmlns:edm="http://docs.oasis-open.org/odata/ns/edm" />
+      </Function>
       <Action Name="accept" IsBound="true">
         <Parameter Name="bindingParameter" Type="graph.event" />
         <Parameter Name="SendResponse" Type="Edm.Boolean" />
@@ -1225,7 +1242,21 @@
         <Property Name="description" Type="Edm.String" />
         <Property Name="displayName" Type="Edm.String" Nullable="false" />
       </EntityType>
-      <Annotations Target="microsoft.graph.directoryObject" />
+      <Annotation>
+        <Annotation Term="Org.OData.Core.V1.ExplicitOperationBindings" xmlns:edm="http://docs.oasis-open.org/odata/ns/edm">
+          <Collection>
+            <String>microsoft.graph.getByIds</String>
+            <String>microsoft.graph.delta</String>
+            <String>microsoft.graph.getAvailableExtensionProperties</String>
+            <String>microsoft.graph.validateProperties</String>
+            <String>microsoft.graph.restore</String>
+            <String>microsoft.graph.getMemberObjects</String>
+            <String>microsoft.graph.getMemberGroups</String>
+            <String>microsoft.graph.checkMemberObjects</String>
+            <String>microsoft.graph.checkMemberGroups</String>
+          </Collection>
+        </Annotation>
+      </Annotation>
     </Schema>
   </edmx:DataServices>
 </edmx:Edmx>
\ No newline at end of file

From 4e7ee75bfbd4ff46aa4ffd12c2fffc73cfc2202f Mon Sep 17 00:00:00 2001
From: Andrew Omondi <andrew.omondi@microsoft.com>
Date: Wed, 4 Oct 2023 13:43:22 +0300
Subject: [PATCH 2/3] Fix incorrect generation

---
 transforms/csdl/preprocess_csdl.xsl             | 3 ++-
 transforms/csdl/preprocess_csdl_test_output.xml | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/transforms/csdl/preprocess_csdl.xsl b/transforms/csdl/preprocess_csdl.xsl
index 90c97142c..c43a0011d 100644
--- a/transforms/csdl/preprocess_csdl.xsl
+++ b/transforms/csdl/preprocess_csdl.xsl
@@ -1986,7 +1986,8 @@
     <xsl:template match="edm:Schema[starts-with(@Namespace, 'microsoft.graph')]/edm:Annotations[@Target='microsoft.graph.directoryObject']/*[starts-with(@Term, 'Org.OData.Capabilities')]"/>
 
     <xsl:template match="edm:Schema[starts-with(@Namespace, 'microsoft.graph')]/edm:Annotations[@Target='microsoft.graph.directoryObject']">
-        <xsl:element name="Annotation">
+        <xsl:element name="Annotations">
+          <xsl:attribute name="Target">microsoft.graph.directoryObject</xsl:attribute>    
           <Annotation Term="Org.OData.Core.V1.ExplicitOperationBindings">
             <Collection>
                 <String>microsoft.graph.getByIds</String>
diff --git a/transforms/csdl/preprocess_csdl_test_output.xml b/transforms/csdl/preprocess_csdl_test_output.xml
index 6e3ce0d2c..92e0f47c0 100644
--- a/transforms/csdl/preprocess_csdl_test_output.xml
+++ b/transforms/csdl/preprocess_csdl_test_output.xml
@@ -1242,7 +1242,7 @@
         <Property Name="description" Type="Edm.String" />
         <Property Name="displayName" Type="Edm.String" Nullable="false" />
       </EntityType>
-      <Annotation>
+      <Annotations Target="microsoft.graph.directoryObject">
         <Annotation Term="Org.OData.Core.V1.ExplicitOperationBindings" xmlns:edm="http://docs.oasis-open.org/odata/ns/edm">
           <Collection>
             <String>microsoft.graph.getByIds</String>
@@ -1256,7 +1256,7 @@
             <String>microsoft.graph.checkMemberGroups</String>
           </Collection>
         </Annotation>
-      </Annotation>
+      </Annotations>
     </Schema>
   </edmx:DataServices>
 </edmx:Edmx>
\ No newline at end of file

From 547c8b828a933ba881eba0248be404fb205bf536 Mon Sep 17 00:00:00 2001
From: Andrew Omondi <andrew.omondi@microsoft.com>
Date: Thu, 5 Oct 2023 17:21:33 +0300
Subject: [PATCH 3/3] Removes containsTarget in internal and external sponsors

---
 transforms/csdl/preprocess_csdl.xsl             | 2 ++
 transforms/csdl/preprocess_csdl_test_output.xml | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/transforms/csdl/preprocess_csdl.xsl b/transforms/csdl/preprocess_csdl.xsl
index 3afa95d13..651b9b099 100644
--- a/transforms/csdl/preprocess_csdl.xsl
+++ b/transforms/csdl/preprocess_csdl.xsl
@@ -438,6 +438,8 @@
     <!-- Remove ContainsTarget attribute for both Kiota-based and PowerShell-based CSDL  -->
     <xsl:template match="edm:Schema[@Namespace='microsoft.graph']/edm:EntityType[@Name='group']/edm:NavigationProperty[@Name='acceptedSenders']/@ContainsTarget|
                          edm:Schema[@Namespace='microsoft.graph']/edm:EntityType[@Name='group']/edm:NavigationProperty[@Name='rejectedSenders']/@ContainsTarget|
+                         edm:Schema[@Namespace='microsoft.graph']/edm:EntityType[@Name='connectedOrganization']/edm:NavigationProperty[@Name='externalSponsors']/@ContainsTarget|
+                         edm:Schema[@Namespace='microsoft.graph']/edm:EntityType[@Name='connectedOrganization']/edm:NavigationProperty[@Name='internalSponsors']/@ContainsTarget|
                          edm:Schema[@Namespace='microsoft.graph']/edm:EntityType[@Name='accessPackageCatalog']/edm:NavigationProperty[@Name='accessPackages']/@ContainsTarget">
         <xsl:apply-templates select="@* | node()"/>
     </xsl:template>
diff --git a/transforms/csdl/preprocess_csdl_test_output.xml b/transforms/csdl/preprocess_csdl_test_output.xml
index 625b899bf..f9c6cd896 100644
--- a/transforms/csdl/preprocess_csdl_test_output.xml
+++ b/transforms/csdl/preprocess_csdl_test_output.xml
@@ -641,7 +641,7 @@
       </EntityType>
       <EntityType Name="connectedOrganization" BaseType="graph.entity">
         <Property Name="description" Type="Edm.String" />
-        <NavigationProperty Name="internalSponsors" Type="Collection(graph.directoryObject)" ContainsTarget="true">
+        <NavigationProperty Name="internalSponsors" Type="Collection(graph.directoryObject)">
           <Annotation Term="Org.OData.Capabilities.V1.NavigationRestrictions">
             <Record>
               <PropertyValue Property="Referenceable" Bool="true" />