From 9a0de02f5c320579e456bb3467a47e252994bc54 Mon Sep 17 00:00:00 2001
From: Irvine Sunday <40403681+irvinesunday@users.noreply.github.com>
Date: Fri, 5 May 2023 18:13:27 +0300
Subject: [PATCH] Removes containment for `accessPackageCatalog/accessPackages`
 nav. prop. (#341)

* Remove containment of accessPackages

* Add tests

* Comment update
---
 transforms/csdl/preprocess_csdl.xsl             | 5 +++--
 transforms/csdl/preprocess_csdl_test_input.xml  | 3 +++
 transforms/csdl/preprocess_csdl_test_output.xml | 3 +++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/transforms/csdl/preprocess_csdl.xsl b/transforms/csdl/preprocess_csdl.xsl
index 6611e6de4..93d16f307 100644
--- a/transforms/csdl/preprocess_csdl.xsl
+++ b/transforms/csdl/preprocess_csdl.xsl
@@ -379,9 +379,10 @@
         <xsl:apply-templates select="@* | node()"/>
     </xsl:template>
 
-    <!-- Remove ContainsTarget attribute. -->
+    <!-- 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='group']/edm:NavigationProperty[@Name='rejectedSenders']/@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_input.xml b/transforms/csdl/preprocess_csdl_test_input.xml
index 077c5bfa3..06e469d81 100644
--- a/transforms/csdl/preprocess_csdl_test_input.xml
+++ b/transforms/csdl/preprocess_csdl_test_input.xml
@@ -70,6 +70,9 @@
                     <Annotation Term="Org.OData.Core.V1.Description" String="The collection of single-value extended properties defined for the contact. Read-only. Nullable." />
                 </NavigationProperty>
             </EntityType>
+            <EntityType Name="accessPackageCatalog" BaseType="graph.entity">                
+                <NavigationProperty Name="accessPackages" Type="Collection(graph.accessPackage)" ContainsTarget="true"/>
+            </EntityType>
             <Annotations Target="microsoft.graph.user/joinedGroups">
                 <Annotation Term="Org.OData.Capabilities.V1.ChangeTracking">
                     <Record>
diff --git a/transforms/csdl/preprocess_csdl_test_output.xml b/transforms/csdl/preprocess_csdl_test_output.xml
index ac663202c..148f4c309 100644
--- a/transforms/csdl/preprocess_csdl_test_output.xml
+++ b/transforms/csdl/preprocess_csdl_test_output.xml
@@ -262,6 +262,9 @@
           </Annotation>
         </NavigationProperty>
       </EntityType>
+      <EntityType Name="accessPackageCatalog" BaseType="graph.entity">
+        <NavigationProperty Name="accessPackages" Type="Collection(graph.accessPackage)" />
+      </EntityType>
       <Annotations Target="microsoft.graph.user/joinedGroups">
         <Annotation Term="Org.OData.Capabilities.V1.ChangeTracking">
           <Record>