more fixes

microsoft · Apr 2, 2024 · 724b63f · 724b63f
1 parent 7ae4a32
commit 724b63f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/it/config.json b/it/config.json
@@ -54,7 +54,13 @@
     ]
   },
   "./tests/Kiota.Builder.IntegrationTests/DiscriminatorSample.yaml": {
-    "MockServerITFolder": "discriminator"
+    "MockServerITFolder": "discriminator",
+    "Suppressions": [
+      {
+        "Language": "ruby",
+        "Rationale": "https://github.com/microsoft/kiota/issues/2484"
+      }
+    ]
   },
   "./tests/Kiota.Builder.IntegrationTests/InheritingErrors.yaml": {
     "MockServerITFolder": "basic",

diff --git a/src/Kiota.Builder/Writers/Python/CodeMethodWriter.cs b/src/Kiota.Builder/Writers/Python/CodeMethodWriter.cs
@@ -138,9 +138,11 @@ private void WriteFactoryMethodBodyForInheritedModel(CodeClass parentClass, Lang
     private void WriteFactoryMethodBodyForUnionModel(CodeMethod codeElement, CodeClass parentClass, CodeParameter parseNodeParameter, LanguageWriter writer)
     {
         var className = parentClass.Name;
-        if (parentClass.Parent != null && !string.IsNullOrEmpty(parentClass.Parent.Name))
+        if (parentClass.Parent is CodeClass pc &&
+            !string.IsNullOrEmpty(pc.Name) &&
+            pc.InnerClasses.Any(x => x == parentClass))
         {
-            className = $"{parentClass.Parent!.Name}.{parentClass.Name}";
+            className = $"{pc.Name}.{parentClass.Name}";
         }
         writer.WriteLine($"{ResultVarName} = {className}()");
         var includeElse = false;