From d034675c57140a5b7fe2cee70e3ba246b84e8a79 Mon Sep 17 00:00:00 2001
From: Mustafa Zengin <muzengin@microsoft.com>
Date: Wed, 27 Jan 2021 13:27:16 -0800
Subject: [PATCH] revert change that caused duplicate actions

---
 transforms/csdl/preprocess_csdl.xsl           | 45 +++++--------------
 .../csdl/preprocess_csdl_test_input.xml       |  7 ++-
 .../csdl/preprocess_csdl_test_output.xml      | 26 +++--------
 3 files changed, 23 insertions(+), 55 deletions(-)

diff --git a/transforms/csdl/preprocess_csdl.xsl b/transforms/csdl/preprocess_csdl.xsl
index 05f5527d7..dc257f1bd 100644
--- a/transforms/csdl/preprocess_csdl.xsl
+++ b/transforms/csdl/preprocess_csdl.xsl
@@ -285,41 +285,18 @@
     <xsl:template match="edm:Schema[@Namespace='microsoft.graph.callRecords']/edm:Function[@Name='getDirectRoutingCalls']"/>
     <xsl:template match="edm:Schema[@Namespace='microsoft.graph']/edm:Function[@Name='delta'][edm:Parameter[@Name='token']][edm:Parameter[@Type='Collection(graph.site)']]"/>
 
-    <!-- accept, decline and tentativelyAccept action signatures have changed. Following rule set keeps the old signaure in the clean metadata.
-    New signatures are copied as is, so we have redundant implmenetations to avoid breaking change for existing client applications. -->
-    <xsl:template name="BackwardsCompatibleEventAction">
-      <xsl:param name="actionName" />
-      <xsl:element name="Action">
-        <xsl:attribute name="Name"><xsl:value-of select = "$actionName" /></xsl:attribute>
-        <xsl:attribute name="IsBound">true</xsl:attribute>
-        <xsl:element name="Parameter">
-          <xsl:attribute name="Name">bindingParameter</xsl:attribute>
-          <xsl:attribute name="Type">graph.event</xsl:attribute>
-        </xsl:element>
-        <xsl:element name="Parameter">
-          <xsl:attribute name="Name">Comment</xsl:attribute>
-          <xsl:attribute name="Type">Edm.String</xsl:attribute>
-          <xsl:attribute name="Unicode">false</xsl:attribute>
-        </xsl:element>
-        <xsl:element name="Parameter">
-          <xsl:attribute name="Name">SendResponse</xsl:attribute>
-          <xsl:attribute name="Type">Edm.Boolean</xsl:attribute>
-        </xsl:element>
-      </xsl:element>
-    </xsl:template>
+    <!-- Reorder action parameters -->
 
-    <xsl:template match="edm:Schema[@Namespace='microsoft.graph']">
-      <xsl:copy>
-        <xsl:apply-templates select="@* | node()"/>
-        <xsl:call-template name="BackwardsCompatibleEventAction">
-          <xsl:with-param name="actionName">accept</xsl:with-param>
-        </xsl:call-template>
-        <xsl:call-template name="BackwardsCompatibleEventAction">
-          <xsl:with-param name="actionName">decline</xsl:with-param>
-        </xsl:call-template>
-        <xsl:call-template name="BackwardsCompatibleEventAction">
-          <xsl:with-param name="actionName">tentativelyAccept</xsl:with-param>
-        </xsl:call-template>
+    <!-- These actions have the same parameters that need reordering. Will need to create a new template
+         for each reordering. -->
+    <xsl:template match="edm:Schema[@Namespace='microsoft.graph']/edm:Action[@Name='accept'][.//edm:Parameter[@Name='bindingParameter'][@Type='graph.event']]|
+                         edm:Schema[@Namespace='microsoft.graph']/edm:Action[@Name='decline'][.//edm:Parameter[@Name='bindingParameter'][@Type='graph.event']]|
+                         edm:Schema[@Namespace='microsoft.graph']/edm:Action[@Name='tentativelyAccept'][.//edm:Parameter[@Name='bindingParameter'][@Type='graph.event']]">
+        <xsl:copy>
+            <xsl:apply-templates select="@*"/>
+            <xsl:apply-templates select="edm:Parameter[@Name='bindingParameter'][@Type='graph.event']" />
+            <xsl:apply-templates select="edm:Parameter[@Name='Comment']" />
+            <xsl:apply-templates select="edm:Parameter[@Name='SendResponse']" />
         </xsl:copy>
     </xsl:template>
 
diff --git a/transforms/csdl/preprocess_csdl_test_input.xml b/transforms/csdl/preprocess_csdl_test_input.xml
index 9f29297a9..e1538e444 100644
--- a/transforms/csdl/preprocess_csdl_test_input.xml
+++ b/transforms/csdl/preprocess_csdl_test_input.xml
@@ -128,15 +128,18 @@
                 <Parameter Name="SendResponse" Type="Edm.Boolean" />
                 <Parameter Name="Comment" Type="Edm.String" Unicode="false" />
             </Action>
+            <Action Name="accept" IsBound="true">
+                <Parameter Name="bindingParameter" Type="graph.eventMessage" />
+                <Parameter Name="SendResponse" Type="Edm.Boolean" />
+                <Parameter Name="Comment" Type="Edm.String" Unicode="false" />
+            </Action>
             <Action Name="decline" IsBound="true">
                 <Parameter Name="bindingParameter" Type="graph.event" />
-                <Parameter Name="ProposedNewTime" Type="graph.timeSlot" />
                 <Parameter Name="SendResponse" Type="Edm.Boolean" />
                 <Parameter Name="Comment" Type="Edm.String" Unicode="false" />
             </Action>
             <Action Name="tentativelyAccept" IsBound="true">
                 <Parameter Name="bindingParameter" Type="graph.event" />
-                <Parameter Name="ProposedNewTime" Type="graph.timeSlot" />
                 <Parameter Name="SendResponse" Type="Edm.Boolean" />
                 <Parameter Name="Comment" Type="Edm.String" Unicode="false" />
             </Action>
diff --git a/transforms/csdl/preprocess_csdl_test_output.xml b/transforms/csdl/preprocess_csdl_test_output.xml
index b1d406c54..83fefd021 100644
--- a/transforms/csdl/preprocess_csdl_test_output.xml
+++ b/transforms/csdl/preprocess_csdl_test_output.xml
@@ -300,20 +300,23 @@
       </EntityContainer>
       <Action Name="accept" IsBound="true">
         <Parameter Name="bindingParameter" Type="graph.event" />
+        <Parameter Name="Comment" Type="Edm.String" Unicode="false" />
+        <Parameter Name="SendResponse" Type="Edm.Boolean" />
+      </Action>
+      <Action Name="accept" IsBound="true">
+        <Parameter Name="bindingParameter" Type="graph.eventMessage" />
         <Parameter Name="SendResponse" Type="Edm.Boolean" />
         <Parameter Name="Comment" Type="Edm.String" Unicode="false" />
       </Action>
       <Action Name="decline" IsBound="true">
         <Parameter Name="bindingParameter" Type="graph.event" />
-        <Parameter Name="ProposedNewTime" Type="graph.timeSlot" />
-        <Parameter Name="SendResponse" Type="Edm.Boolean" />
         <Parameter Name="Comment" Type="Edm.String" Unicode="false" />
+        <Parameter Name="SendResponse" Type="Edm.Boolean" />
       </Action>
       <Action Name="tentativelyAccept" IsBound="true">
         <Parameter Name="bindingParameter" Type="graph.event" />
-        <Parameter Name="ProposedNewTime" Type="graph.timeSlot" />
-        <Parameter Name="SendResponse" Type="Edm.Boolean" />
         <Parameter Name="Comment" Type="Edm.String" Unicode="false" />
+        <Parameter Name="SendResponse" Type="Edm.Boolean" />
       </Action>
       <Action Name="createUploadSession" IsBound="true">
         <Parameter Name="bindingParameter" Type="graph.driveItem" />
@@ -324,21 +327,6 @@
         <Parameter Name="bindingParameter" Type="Collection(graph.site)" />
         <ReturnType Type="Collection(graph.site)" />
       </Function>
-      <Action Name="accept" IsBound="true">
-        <Parameter Name="bindingParameter" Type="graph.event" />
-        <Parameter Name="Comment" Type="Edm.String" Unicode="false" />
-        <Parameter Name="SendResponse" Type="Edm.Boolean" />
-      </Action>
-      <Action Name="decline" IsBound="true">
-        <Parameter Name="bindingParameter" Type="graph.event" />
-        <Parameter Name="Comment" Type="Edm.String" Unicode="false" />
-        <Parameter Name="SendResponse" Type="Edm.Boolean" />
-      </Action>
-      <Action Name="tentativelyAccept" IsBound="true">
-        <Parameter Name="bindingParameter" Type="graph.event" />
-        <Parameter Name="Comment" Type="Edm.String" Unicode="false" />
-        <Parameter Name="SendResponse" Type="Edm.Boolean" />
-      </Action>
     </Schema>
     <Schema Namespace="microsoft.graph.callRecords" xmlns="http://docs.oasis-open.org/odata/ns/edm">
       <EnumType Name="callType">