Addressing Jason's comment

Author: FehintolaObafemi

msgraph-metadata

@@ -61,8 +61,7 @@ export interface EntityTypeConfig {
   ResourceKey?: ResourceKeyConfig
   OrchestrationProperties?: OrchestrationPropertiesConfig
   IsSingleton?: boolean,
-  PathSegmentName?: string,
-  IsInternal?: boolean
+  PathSegmentName?: string
 }
 
 export class Config {

src/swagger-generation/src/config.ts

@@ -28,12 +28,6 @@ export const writeMetadata = (definitionMap: DefinitionMap, config: Config): Met
   config.EntityTypes.forEach((entityTypeConfig: EntityTypeConfig, id: string) => {
     const rootUri = entityTypeConfig.RootUri;
 
-    // Skip internal entities
-    if (entityTypeConfig.IsInternal) {
-      console.log("Skipping internal entity " + id);
-      return;
-    }
-
     if (rootUri) {
       console.log("Writing metadata for " + id);
 

src/swagger-generation/src/metadataWriter.ts

@@ -94,11 +94,6 @@ export const writeSwagger = (definitionMap: DefinitionMap, config: Config): Swag
       return;
     }
 
-    // Skip internal entities
-    if (entityTypeConfig.IsInternal) {
-      return;
-    }
-    
     const entityName: string = definitionMap.EntityMap.get(id)!.Name
     const entitySegments: string[] = entityTypeConfig.RootUri.split("/").slice(-2)
     const operationType: string = entityTypeConfig.IsReadonlyResource ? "get" : "put";

src/swagger-generation/src/swaggerWriter.ts

@@ -355,19 +355,19 @@ describe("writeMetadata", () => {
       const entityTypes: Map<string, EntityTypeConfig> = new Map<string, EntityTypeConfig>();
 
       definitionMap.EntityMap.set(
-        "microsoft.graph.domainRegistration",
-        new EntityType("domainRegistration", undefined, false, undefined, false, false, [], [])
+        "microsoft.graph.testSingletonEntity",
+        new EntityType("testSingletonEntity", undefined, false, undefined, false, false, [], [])
       );
 
-      entityTypes.set("microsoft.graph.domainRegistration", {
-        Name: "microsoft.graph.domainRegistration",
+      entityTypes.set("microsoft.graph.testSingletonEntity", {
+        Name: "microsoft.graph.testSingletonEntity",
         Upsertable: true,
-        RootUri: "/applications/domainRegistration",
+        RootUri: "/testContainer/testSingleton",
         IsSingleton: true,
-        PathSegmentName: "domainRegistration",
-        EntitySetPath: "applications/domainRegistration",
+        PathSegmentName: "testSingleton",
+        EntitySetPath: "testContainer/testSingleton",
         ResourceKey: {
-          Name: "name",
+          Name: "testKey",
           OmitInPayload: true
         },
         NavigationProperty: [],
@@ -381,70 +381,13 @@ describe("writeMetadata", () => {
 
       const metadata = writeMetadata(definitionMap, config);
 
-      expect(metadata["applications/domainRegistration"]).toBeDefined();
-      expect(metadata["applications/domainRegistration"]["beta"].isSingleton).toBe(true);
-      expect(metadata["applications/domainRegistration"]["beta"].pathSegmentName).toBe("domainRegistration");
-      expect(metadata["applications/domainRegistration"]["beta"].resourceKey).toEqual({
-        name: "name",
+      expect(metadata["testContainer/testSingleton"]).toBeDefined();
+      expect(metadata["testContainer/testSingleton"]["beta"].isSingleton).toBe(true);
+      expect(metadata["testContainer/testSingleton"]["beta"].pathSegmentName).toBe("testSingleton");
+      expect(metadata["testContainer/testSingleton"]["beta"].resourceKey).toEqual({
+        name: "testKey",
         omitInPayload: true
       });
     });
-
-    it("should skip internal entities when IsInternal is true", () => {
-      const definitionMap: DefinitionMap = new DefinitionMap();
-      const entityTypes: Map<string, EntityTypeConfig> = new Map<string, EntityTypeConfig>();
-
-      definitionMap.EntityMap.set(
-        "microsoft.graph.internalEntity",
-        new EntityType("internalEntity", undefined, false, undefined, false, false, [], [])
-      );
-
-      entityTypes.set("microsoft.graph.internalEntity", {
-        Name: "microsoft.graph.internalEntity",
-        Upsertable: true,
-        RootUri: "/internalEntities",
-        IsInternal: true,
-        NavigationProperty: [],
-      } as EntityTypeConfig);
-
-      const config = {
-        EntityTypes: entityTypes,
-        MetadataFilePath: "https://example.com",
-        APIVersion: "beta",
-      } as Config;
-
-      const metadata = writeMetadata(definitionMap, config);
-
-      expect(metadata["internalEntities"]).toBeUndefined();
-    });
-
-    it("should include internal entity in metadata when IsInternal is false", () => {
-      const definitionMap: DefinitionMap = new DefinitionMap();
-      const entityTypes: Map<string, EntityTypeConfig> = new Map<string, EntityTypeConfig>();
-
-      definitionMap.EntityMap.set(
-        "microsoft.graph.publicEntity",
-        new EntityType("publicEntity", undefined, false, undefined, false, false, [], [])
-      );
-
-      entityTypes.set("microsoft.graph.publicEntity", {
-        Name: "microsoft.graph.publicEntity",
-        Upsertable: true,
-        RootUri: "/publicEntities",
-        IsInternal: false,
-        NavigationProperty: [],
-      } as EntityTypeConfig);
-
-      const config = {
-        EntityTypes: entityTypes,
-        MetadataFilePath: "https://example.com",
-        APIVersion: "beta",
-      } as Config;
-
-      const metadata = writeMetadata(definitionMap, config);
-
-      expect(metadata["publicEntities"]).toBeDefined();
-      expect(metadata["publicEntities"]["beta"]).toBeDefined();
-    });
   });
 });

src/swagger-generation/tests/metadataWriter.test.ts

@@ -1484,39 +1484,6 @@ describe('singleton resource support', () => {
     }
   });
 
-  it('should skip internal entities in swagger generation when IsInternal is true', () => {
-    const definitionMap: DefinitionMap = new DefinitionMap();
-    const entityMap: EntityMap = new Map<string, EntityType>();
-    
-    const internalEntity = new EntityType('internalEntity', undefined, false, undefined, false, false, [], []);
-    entityMap.set('microsoft.graph.internalEntity', internalEntity);
-
-    const entityTypes: Map<string, EntityTypeConfig> = new Map<string, EntityTypeConfig>();
-    entityTypes.set('microsoft.graph.internalEntity', {
-      Name: 'microsoft.graph.internalEntity',
-      RootUri: '/internalEntities',
-      Upsertable: true,
-      IsInternal: true,
-      NavigationProperty: []
-    } as EntityTypeConfig);
-
-    const config = {
-      ExtensionVersion: "1.0.0",
-      EntityTypes: entityTypes,
-      MetadataFilePath: 'https://example.com',
-      APIVersion: 'beta'
-    } as Config;
-
-    definitionMap.EntityMap = entityMap;
-    definitionMap.EnumMap = new Map();
-
-    const result = writeSwagger(definitionMap, config);
-
-    // Check that no path is generated for internal entity
-    const internalPaths = Object.keys(result.paths).filter(path => path.includes('internalEntities'));
-    expect(internalPaths).toHaveLength(0);
-  });
-
   it('should generate swagger for container singleton resources', () => {
     const definitionMap: DefinitionMap = new DefinitionMap();
     const entityMap: EntityMap = new Map<string, EntityType>();