Merge pull request #704 from microsoftgraph/andrueastman/metadataFixes

Adds missing referencable annotation for `managedDevice` nav properties `deviceCategory`.
microsoftgraph · Oct 8, 2024 · a6aea2d · a6aea2d
2 parents 530d601 + 8c36f25
commit a6aea2d
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 0 deletions.
diff --git a/transforms/csdl/preprocess_csdl.xsl b/transforms/csdl/preprocess_csdl.xsl
@@ -2481,6 +2481,7 @@
                         edm:Schema[@Namespace='microsoft.graph']/edm:EntityType[@Name='servicePrincipal']/edm:NavigationProperty[@Name='claimsMappingPolicies']|
                         edm:Schema[@Namespace='microsoft.graph']/edm:EntityType[@Name='servicePrincipal']/edm:NavigationProperty[@Name='homeRealmDiscoveryPolicies']|
                         edm:Schema[@Namespace='microsoft.graph']/edm:EntityType[@Name='user']/edm:NavigationProperty[@Name='manager']|
+                        edm:Schema[@Namespace='microsoft.graph']/edm:EntityType[@Name='managedDevice']/edm:NavigationProperty[@Name='deviceCategory']|
                         edm:Schema[@Namespace='microsoft.graph']/edm:ComplexType[@Name='userFlowApiConnectorConfiguration']/edm:NavigationProperty[@Name='postAttributeCollection']|
                         edm:Schema[@Namespace='microsoft.graph']/edm:ComplexType[@Name='userFlowApiConnectorConfiguration']/edm:NavigationProperty[@Name='postFederationSignup']">
         <xsl:copy>

diff --git a/transforms/csdl/preprocess_csdl_test_input.xml b/transforms/csdl/preprocess_csdl_test_input.xml
@@ -101,6 +101,14 @@
             <EntityType Name="authentication" BaseType="graph.entity">
                 <Property Name="signInPreferences" Type="graph.signInPreferences" />
             </EntityType>
+            <EntityType Name="managedDevice" BaseType="graph.entity">
+                <NavigationProperty Name="users" Type="Collection(graph.user)" />
+                <NavigationProperty Name="deviceCategory" Type="graph.deviceCategory" />
+            </EntityType>
+            <EntityType Name="deviceCategory" BaseType="graph.entity">
+                <Property Name="description" Type="Edm.String" />
+                <Property Name="displayName" Type="Edm.String" />
+            </EntityType>
             <EntityType Name="organizationalBrandingProperties" BaseType="graph.entity" Abstract="true">
                 <Property Name="backgroundImage" Type="Edm.Stream" />
                 <Property Name="bannerLogo" Type="Edm.Stream" />

diff --git a/transforms/csdl/preprocess_csdl_test_output.xml b/transforms/csdl/preprocess_csdl_test_output.xml
@@ -454,6 +454,20 @@
           </Annotation>
         </Property>
       </EntityType>
+      <EntityType Name="managedDevice" BaseType="graph.entity">
+        <NavigationProperty Name="users" Type="Collection(graph.user)" />
+        <NavigationProperty Name="deviceCategory" Type="graph.deviceCategory">
+          <Annotation Term="Org.OData.Capabilities.V1.NavigationRestrictions">
+            <Record>
+              <PropertyValue Property="Referenceable" Bool="true" />
+            </Record>
+          </Annotation>
+        </NavigationProperty>
+      </EntityType>
+      <EntityType Name="deviceCategory" BaseType="graph.entity">
+        <Property Name="description" Type="Edm.String" />
+        <Property Name="displayName" Type="Edm.String" />
+      </EntityType>
       <EntityType Name="organizationalBrandingProperties" BaseType="graph.entity" Abstract="true">
         <Property Name="backgroundImage" Type="Edm.Stream">
           <Annotation Term="Org.OData.Core.V1.AcceptableMediaTypes" xmlns:edm="http://docs.oasis-open.org/odata/ns/edm">