From 54b17351ff0e534e12e29096c098f5406d6118d0 Mon Sep 17 00:00:00 2001
From: ramsessanchez <63934382+ramsessanchez@users.noreply.github.com>
Date: Tue, 10 Jun 2025 12:14:20 -0700
Subject: [PATCH 1/4] add sxl annotation transforms for instances and
 exceptionOccurrences

---
 transforms/csdl/preprocess_csdl.xsl           | 28 ++++++++++-
 .../csdl/preprocess_csdl_test_input.xml       | 36 ++++++++++++++
 .../csdl/preprocess_csdl_test_output.xml      | 49 +++++++++++++++++++
 3 files changed, 112 insertions(+), 1 deletion(-)

diff --git a/transforms/csdl/preprocess_csdl.xsl b/transforms/csdl/preprocess_csdl.xsl
index 6c674c84d..038c7c02b 100644
--- a/transforms/csdl/preprocess_csdl.xsl
+++ b/transforms/csdl/preprocess_csdl.xsl
@@ -967,11 +967,37 @@
                             </xsl:call-template>
                         </xsl:element>
                     </xsl:element>
+                    <xsl:element name="PropertyValue">
+                        <xsl:attribute name="Property">Navigability</xsl:attribute>
+                            <xsl:element name="EnumMember">Org.OData.Capabilities.V1.NavigationType/None</xsl:element>
+                    </xsl:element> 
                 </xsl:element>
             </xsl:element>
         </xsl:copy>
     </xsl:template>
 
+    <xsl:template match="edm:Schema[@Namespace='microsoft.graph']/edm:EntityType[@Name='event']/edm:NavigationProperty[@Name='exceptionOccurrences']">
+        <xsl:copy>
+            <xsl:apply-templates select="@* | node()"/>
+            <xsl:choose>
+                <xsl:when test="$open-api-generation='False'">
+                    <xsl:element name="Annotations">
+                        <xsl:attribute name="Target">microsoft.graph.event/exceptionOccurrences</xsl:attribute>
+                        <xsl:element name="Annotation">
+                            <xsl:attribute name="Term">Org.OData.Capabilities.V1.NavigationRestrictions</xsl:attribute>
+                            <xsl:element name="Record" namespace="{namespace-uri()}">
+                                <xsl:element name="PropertyValue">
+                                    <xsl:attribute name="Property">Navigability</xsl:attribute>
+                                        <xsl:element name="EnumMember">Org.OData.Capabilities.V1.NavigationType/None</xsl:element>
+                                </xsl:element> 
+                            </xsl:element>
+                        </xsl:element> 
+                    </xsl:element>
+                </xsl:when>                       
+            </xsl:choose>
+        </xsl:copy>
+    </xsl:template>
+
     <!-- Add paths for user mailboxSettings by adding annotations to read and update the complex property-->
     <xsl:template match="edm:Schema[@Namespace='microsoft.graph']/edm:EntityType[@Name='user']/edm:Property[@Name='mailboxSettings']">
         <xsl:copy>
@@ -1375,7 +1401,7 @@
     </xsl:template>
        
     <!-- Add Navigation Restrictions Annotations -->
-    <xsl:template match="edm:Schema[@Namespace='microsoft.graph']">
+    <xsl:template match="edm:Schema[@Namespace='microsoft.graph']"> 
         <xsl:copy>
             <xsl:apply-templates select="@* | node()"/>
             
diff --git a/transforms/csdl/preprocess_csdl_test_input.xml b/transforms/csdl/preprocess_csdl_test_input.xml
index e367bc509..06f442e1b 100644
--- a/transforms/csdl/preprocess_csdl_test_input.xml
+++ b/transforms/csdl/preprocess_csdl_test_input.xml
@@ -19,6 +19,42 @@
                 <Property Name="ruleName" Type="Edm.String" />
                 <NavigationProperty Name="scheduledActionConfigurations" Type="Collection(graph.deviceManagementComplianceActionItem)" />
             </EntityType>
+            <EntityType Name="event" BaseType="graph.outlookItem" OpenType="true">
+                <NavigationProperty Name="exceptionOccurrences" Type="Collection(graph.event)" ContainsTarget="true" />
+                <NavigationProperty Name="instances" Type="Collection(graph.event)" ContainsTarget="true">
+                  <Annotation Term="Org.OData.Capabilities.V1.NavigationRestrictions">
+                    <Record>
+                      <PropertyValue Property="RestrictedProperties">
+                        <Collection>
+                          <Record>
+                            <PropertyValue Property="NavigationProperty">
+                              <PropertyPath>instances</PropertyPath>
+                            </PropertyValue>
+                            <PropertyValue Property="ReadRestrictions">
+                              <Record>
+                                <PropertyValue Property="CustomQueryOptions">
+                                  <Collection>
+                                    <Record>
+                                      <PropertyValue Property="Name" String="startDateTime" />
+                                      <PropertyValue Property="Description" String="The start date and time of the time range, represented in ISO 8601 format. For example, 2019-11-08T19:00:00-08:00" />
+                                      <PropertyValue Property="Required" Bool="true" />
+                                    </Record>
+                                    <Record>
+                                      <PropertyValue Property="Name" String="endDateTime" />
+                                      <PropertyValue Property="Description" String="The end date and time of the time range, represented in ISO 8601 format. For example, 2019-11-08T20:00:00-08:00" />
+                                      <PropertyValue Property="Required" Bool="true" />
+                                    </Record>
+                                  </Collection>
+                                </PropertyValue>
+                              </Record>
+                            </PropertyValue>
+                          </Record>
+                        </Collection>
+                      </PropertyValue>
+                    </Record>
+                  </Annotation>
+                </NavigationProperty>
+            </EntityType>
             <EntityType Name="plannerPlan" BaseType="graph.entity">
                 <Property Name="createdBy" Type="graph.identitySet" />
                 <Property Name="createdDateTime" Type="Edm.DateTimeOffset" />
diff --git a/transforms/csdl/preprocess_csdl_test_output.xml b/transforms/csdl/preprocess_csdl_test_output.xml
index fd2ae0f63..6bc5c0f44 100644
--- a/transforms/csdl/preprocess_csdl_test_output.xml
+++ b/transforms/csdl/preprocess_csdl_test_output.xml
@@ -54,6 +54,55 @@
         <Property Name="ruleName" Type="Edm.String" />
         <NavigationProperty Name="scheduledActionConfigurations" Type="Collection(graph.deviceManagementComplianceActionItem)" ContainsTarget="true" />
       </EntityType>
+      <EntityType Name="event" BaseType="graph.outlookItem" OpenType="true">
+        <NavigationProperty Name="exceptionOccurrences" Type="Collection(graph.event)" ContainsTarget="true">
+          <Annotations Target="microsoft.graph.event/exceptionOccurrences">
+            <Annotation Term="Org.OData.Capabilities.V1.NavigationRestrictions">
+              <Record>
+                <PropertyValue Property="Navigability">
+                  <EnumMember>Org.OData.Capabilities.V1.NavigationType/None</EnumMember>
+                </PropertyValue>
+              </Record>
+            </Annotation>
+          </Annotations>
+        </NavigationProperty>
+        <NavigationProperty Name="instances" Type="Collection(graph.event)" ContainsTarget="true">
+          <Annotation Term="Org.OData.Capabilities.V1.NavigationRestrictions">
+            <Record>
+              <PropertyValue Property="RestrictedProperties">
+                <Collection>
+                  <Record>
+                    <PropertyValue Property="NavigationProperty">
+                      <PropertyPath>instances</PropertyPath>
+                    </PropertyValue>
+                    <PropertyValue Property="ReadRestrictions">
+                      <Record>
+                        <PropertyValue Property="CustomQueryOptions">
+                          <Collection>
+                            <Record>
+                              <PropertyValue Property="Name" String="startDateTime" />
+                              <PropertyValue Property="Description" String="The start date and time of the time range, represented in ISO 8601 format. For example, 2019-11-08T19:00:00-08:00" />
+                              <PropertyValue Property="Required" Bool="true" />
+                            </Record>
+                            <Record>
+                              <PropertyValue Property="Name" String="endDateTime" />
+                              <PropertyValue Property="Description" String="The end date and time of the time range, represented in ISO 8601 format. For example, 2019-11-08T20:00:00-08:00" />
+                              <PropertyValue Property="Required" Bool="true" />
+                            </Record>
+                          </Collection>
+                        </PropertyValue>
+                      </Record>
+                    </PropertyValue>
+                  </Record>
+                </Collection>
+              </PropertyValue>
+              <PropertyValue Property="Navigability">
+                <EnumMember>Org.OData.Capabilities.V1.NavigationType/None</EnumMember>
+              </PropertyValue>
+            </Record>
+          </Annotation>
+        </NavigationProperty>
+      </EntityType>
       <EntityType Name="plannerPlan" BaseType="graph.entity">
         <Property Name="createdBy" Type="graph.identitySet" />
         <Property Name="createdDateTime" Type="Edm.DateTimeOffset" />

From cec14e7622dbd0196e043116f88ef5188e3ef5da Mon Sep 17 00:00:00 2001
From: ramsessanchez <63934382+ramsessanchez@users.noreply.github.com>
Date: Thu, 12 Jun 2025 03:52:06 -0700
Subject: [PATCH 2/4] use readRestrictions and Indexable instease of
 navigability

---
 transforms/csdl/preprocess_csdl.xsl           | 50 +++++++++++--------
 .../csdl/preprocess_csdl_test_output.xml      | 32 ++++++++----
 2 files changed, 51 insertions(+), 31 deletions(-)

diff --git a/transforms/csdl/preprocess_csdl.xsl b/transforms/csdl/preprocess_csdl.xsl
index 038c7c02b..045297802 100644
--- a/transforms/csdl/preprocess_csdl.xsl
+++ b/transforms/csdl/preprocess_csdl.xsl
@@ -967,34 +967,44 @@
                             </xsl:call-template>
                         </xsl:element>
                     </xsl:element>
-                    <xsl:element name="PropertyValue">
-                        <xsl:attribute name="Property">Navigability</xsl:attribute>
-                            <xsl:element name="EnumMember">Org.OData.Capabilities.V1.NavigationType/None</xsl:element>
-                    </xsl:element> 
                 </xsl:element>
             </xsl:element>
+            <xsl:call-template name="ReadRestrictionsTemplate">
+                <xsl:with-param name="readable">true</xsl:with-param>
+                <xsl:with-param name="readableByKey">false</xsl:with-param>
+            </xsl:call-template>
+            <xsl:call-template name="IndexableByKeyTemplate">
+              <xsl:with-param name="indexableByKey">false</xsl:with-param>
+          </xsl:call-template>
+        </xsl:copy>
+    </xsl:template>
+
+    <xsl:template match="edm:Schema[@Namespace='microsoft.graph']/edm:EntityType[@Name='bookingBusiness']/edm:NavigationProperty[@Name='calendarView']|
+                         edm:Schema[@Namespace='microsoft.graph']/edm:EntityType[@Name='calendar']/edm:NavigationProperty[@Name='calendarView']|
+                         edm:Schema[@Namespace='microsoft.graph']/edm:EntityType[@Name='group']/edm:NavigationProperty[@Name='calendarView']|
+                         edm:Schema[@Namespace='microsoft.graph']/edm:EntityType[@Name='user']/edm:NavigationProperty[@Name='calendarView']">
+        <xsl:copy>
+            <xsl:apply-templates select="@* | node()"/>
+            <xsl:call-template name="ReadRestrictionsTemplate">
+                <xsl:with-param name="readable">true</xsl:with-param>
+                <xsl:with-param name="readableByKey">false</xsl:with-param>
+            </xsl:call-template>
+            <xsl:call-template name="IndexableByKeyTemplate">
+              <xsl:with-param name="indexableByKey">false</xsl:with-param>
+          </xsl:call-template>
         </xsl:copy>
     </xsl:template>
 
     <xsl:template match="edm:Schema[@Namespace='microsoft.graph']/edm:EntityType[@Name='event']/edm:NavigationProperty[@Name='exceptionOccurrences']">
         <xsl:copy>
             <xsl:apply-templates select="@* | node()"/>
-            <xsl:choose>
-                <xsl:when test="$open-api-generation='False'">
-                    <xsl:element name="Annotations">
-                        <xsl:attribute name="Target">microsoft.graph.event/exceptionOccurrences</xsl:attribute>
-                        <xsl:element name="Annotation">
-                            <xsl:attribute name="Term">Org.OData.Capabilities.V1.NavigationRestrictions</xsl:attribute>
-                            <xsl:element name="Record" namespace="{namespace-uri()}">
-                                <xsl:element name="PropertyValue">
-                                    <xsl:attribute name="Property">Navigability</xsl:attribute>
-                                        <xsl:element name="EnumMember">Org.OData.Capabilities.V1.NavigationType/None</xsl:element>
-                                </xsl:element> 
-                            </xsl:element>
-                        </xsl:element> 
-                    </xsl:element>
-                </xsl:when>                       
-            </xsl:choose>
+            <xsl:call-template name="ReadRestrictionsTemplate">
+                <xsl:with-param name="readable">false</xsl:with-param>
+                <xsl:with-param name="readableByKey">false</xsl:with-param>
+            </xsl:call-template>
+            <xsl:call-template name="IndexableByKeyTemplate">
+                <xsl:with-param name="indexableByKey">false</xsl:with-param>
+            </xsl:call-template>
         </xsl:copy>
     </xsl:template>
 
diff --git a/transforms/csdl/preprocess_csdl_test_output.xml b/transforms/csdl/preprocess_csdl_test_output.xml
index 6bc5c0f44..ba4111b8b 100644
--- a/transforms/csdl/preprocess_csdl_test_output.xml
+++ b/transforms/csdl/preprocess_csdl_test_output.xml
@@ -56,15 +56,17 @@
       </EntityType>
       <EntityType Name="event" BaseType="graph.outlookItem" OpenType="true">
         <NavigationProperty Name="exceptionOccurrences" Type="Collection(graph.event)" ContainsTarget="true">
-          <Annotations Target="microsoft.graph.event/exceptionOccurrences">
-            <Annotation Term="Org.OData.Capabilities.V1.NavigationRestrictions">
-              <Record>
-                <PropertyValue Property="Navigability">
-                  <EnumMember>Org.OData.Capabilities.V1.NavigationType/None</EnumMember>
-                </PropertyValue>
-              </Record>
-            </Annotation>
-          </Annotations>
+          <Annotation Term="Org.OData.Capabilities.V1.ReadRestrictions">
+            <Record>
+              <PropertyValue Property="Readable" Bool="false" />
+              <PropertyValue Property="ReadByKeyRestrictions">
+                <Record>
+                  <PropertyValue Property="Readable" Bool="false" />
+                </Record>
+              </PropertyValue>
+            </Record>
+          </Annotation>
+          <Annotation Term="Org.OData.Capabilities.V1.IndexableByKey" Bool="false" />
         </NavigationProperty>
         <NavigationProperty Name="instances" Type="Collection(graph.event)" ContainsTarget="true">
           <Annotation Term="Org.OData.Capabilities.V1.NavigationRestrictions">
@@ -96,11 +98,19 @@
                   </Record>
                 </Collection>
               </PropertyValue>
-              <PropertyValue Property="Navigability">
-                <EnumMember>Org.OData.Capabilities.V1.NavigationType/None</EnumMember>
+            </Record>
+          </Annotation>
+          <Annotation Term="Org.OData.Capabilities.V1.ReadRestrictions">
+            <Record>
+              <PropertyValue Property="Readable" Bool="true" />
+              <PropertyValue Property="ReadByKeyRestrictions">
+                <Record>
+                  <PropertyValue Property="Readable" Bool="false" />
+                </Record>
               </PropertyValue>
             </Record>
           </Annotation>
+          <Annotation Term="Org.OData.Capabilities.V1.IndexableByKey" Bool="false" />
         </NavigationProperty>
       </EntityType>
       <EntityType Name="plannerPlan" BaseType="graph.entity">

From 9450040247ffe12fcb0177e6269273a96671db4b Mon Sep 17 00:00:00 2001
From: ramsessanchez <63934382+ramsessanchez@users.noreply.github.com>
Date: Thu, 12 Jun 2025 14:28:13 -0700
Subject: [PATCH 3/4] navigability none for exceptionoccurrences

---
 transforms/csdl/preprocess_csdl.xsl             | 12 ++++--------
 transforms/csdl/preprocess_csdl_test_output.xml | 10 +++-------
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/transforms/csdl/preprocess_csdl.xsl b/transforms/csdl/preprocess_csdl.xsl
index 045297802..cfea7a792 100644
--- a/transforms/csdl/preprocess_csdl.xsl
+++ b/transforms/csdl/preprocess_csdl.xsl
@@ -997,14 +997,10 @@
 
     <xsl:template match="edm:Schema[@Namespace='microsoft.graph']/edm:EntityType[@Name='event']/edm:NavigationProperty[@Name='exceptionOccurrences']">
         <xsl:copy>
-            <xsl:apply-templates select="@* | node()"/>
-            <xsl:call-template name="ReadRestrictionsTemplate">
-                <xsl:with-param name="readable">false</xsl:with-param>
-                <xsl:with-param name="readableByKey">false</xsl:with-param>
-            </xsl:call-template>
-            <xsl:call-template name="IndexableByKeyTemplate">
-                <xsl:with-param name="indexableByKey">false</xsl:with-param>
-            </xsl:call-template>
+            <xsl:copy-of select="@* | node()" />
+                <xsl:call-template name="NavigationRestrictionsTemplate">
+                    <xsl:with-param name="navigability">None</xsl:with-param>
+                </xsl:call-template>
         </xsl:copy>
     </xsl:template>
 
diff --git a/transforms/csdl/preprocess_csdl_test_output.xml b/transforms/csdl/preprocess_csdl_test_output.xml
index ba4111b8b..6e3ff0fdd 100644
--- a/transforms/csdl/preprocess_csdl_test_output.xml
+++ b/transforms/csdl/preprocess_csdl_test_output.xml
@@ -56,17 +56,13 @@
       </EntityType>
       <EntityType Name="event" BaseType="graph.outlookItem" OpenType="true">
         <NavigationProperty Name="exceptionOccurrences" Type="Collection(graph.event)" ContainsTarget="true">
-          <Annotation Term="Org.OData.Capabilities.V1.ReadRestrictions">
+          <Annotation Term="Org.OData.Capabilities.V1.NavigationRestrictions">
             <Record>
-              <PropertyValue Property="Readable" Bool="false" />
-              <PropertyValue Property="ReadByKeyRestrictions">
-                <Record>
-                  <PropertyValue Property="Readable" Bool="false" />
-                </Record>
+              <PropertyValue Property="Navigability">
+                <EnumMember>Org.OData.Capabilities.V1.NavigationType/None</EnumMember>
               </PropertyValue>
             </Record>
           </Annotation>
-          <Annotation Term="Org.OData.Capabilities.V1.IndexableByKey" Bool="false" />
         </NavigationProperty>
         <NavigationProperty Name="instances" Type="Collection(graph.event)" ContainsTarget="true">
           <Annotation Term="Org.OData.Capabilities.V1.NavigationRestrictions">

From 284e58199a02b9ce30de27cfe81a1e0a131d2897 Mon Sep 17 00:00:00 2001
From: ramsessanchez <63934382+ramsessanchez@users.noreply.github.com>
Date: Thu, 12 Jun 2025 15:17:13 -0700
Subject: [PATCH 4/4] add comments

---
 transforms/csdl/preprocess_csdl.xsl | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/transforms/csdl/preprocess_csdl.xsl b/transforms/csdl/preprocess_csdl.xsl
index cfea7a792..c80c8bbae 100644
--- a/transforms/csdl/preprocess_csdl.xsl
+++ b/transforms/csdl/preprocess_csdl.xsl
@@ -969,16 +969,20 @@
                     </xsl:element>
                 </xsl:element>
             </xsl:element>
+            <!--Add readRestcitions to Instances through annotations. Instances is readble, but not indexable or readableByKey-->
             <xsl:call-template name="ReadRestrictionsTemplate">
                 <xsl:with-param name="readable">true</xsl:with-param>
                 <xsl:with-param name="readableByKey">false</xsl:with-param>
             </xsl:call-template>
             <xsl:call-template name="IndexableByKeyTemplate">
               <xsl:with-param name="indexableByKey">false</xsl:with-param>
-          </xsl:call-template>
+            </xsl:call-template>
         </xsl:copy>
     </xsl:template>
 
+    <!--Add readRestcitions to CalendarView through annotations. CalendarView is readble, but not indexable or readableByKey-->
+    <!--https://github.com/oasis-tcs/odata-vocabularies/blob/main/vocabularies/Org.OData.Capabilities.V1.md#ReadByKeyRestrictionsType-->
+    <!--https://github.com/oasis-tcs/odata-vocabularies/blob/main/vocabularies/Org.OData.Capabilities.V1.md#defaultcapabilitiestype-->
     <xsl:template match="edm:Schema[@Namespace='microsoft.graph']/edm:EntityType[@Name='bookingBusiness']/edm:NavigationProperty[@Name='calendarView']|
                          edm:Schema[@Namespace='microsoft.graph']/edm:EntityType[@Name='calendar']/edm:NavigationProperty[@Name='calendarView']|
                          edm:Schema[@Namespace='microsoft.graph']/edm:EntityType[@Name='group']/edm:NavigationProperty[@Name='calendarView']|
@@ -994,7 +998,8 @@
           </xsl:call-template>
         </xsl:copy>
     </xsl:template>
-
+  <!--Remove exceptionOccurrences from all URI and navigation paths by adding NavigrationRestriction annotations-->
+  <!--https://github.com/oasis-tcs/odata-vocabularies/blob/main/vocabularies/Org.OData.Capabilities.V1.md#navigationrestrictionstype-->
     <xsl:template match="edm:Schema[@Namespace='microsoft.graph']/edm:EntityType[@Name='event']/edm:NavigationProperty[@Name='exceptionOccurrences']">
         <xsl:copy>
             <xsl:copy-of select="@* | node()" />