Code refactoring

Author: MaggieKimani1

src/Microsoft.OpenApi.Tool/OpenApiService.cs

@@ -45,9 +45,14 @@ public static void ProcessOpenApiDocument(
             document = result.OpenApiDocument;
 
             // Check if filter options are provided, then execute
-            if (!string.IsNullOrEmpty(filterbyOperationIds) || !string.IsNullOrEmpty(filterByTags))
+            if (!string.IsNullOrEmpty(filterbyOperationIds))
             {
-                var predicate = OpenApiFilterService.CreatePredicate(filterbyOperationIds, filterByTags);
+                var predicate = OpenApiFilterService.CreatePredicate(operationIds: filterbyOperationIds);
+                document = OpenApiFilterService.CreateFilteredDocument(document, predicate);
+            }
+            if (!string.IsNullOrEmpty(filterByTags))
+            {
+                var predicate = OpenApiFilterService.CreatePredicate(tags: filterByTags);
                 document = OpenApiFilterService.CreateFilteredDocument(document, predicate);
             }
 

src/Microsoft.OpenApi.Tool/Program.cs

@@ -26,8 +26,8 @@ static async Task<int> Main(string[] args)
                 new Option("--format", "File format",typeof(OpenApiFormat) ),
                 new Option("--inline", "Inline $ref instances", typeof(bool) ),
                 new Option("--resolveExternal","Resolve external $refs", typeof(bool)),
-                new Option("--filterByOperationId", "Filters OpenApiDocument by OperationId provided", typeof(string)),
-                new Option("--filterByTag", "Filters OpenApiDocument by Tag(s) provided", typeof(string))
+                new Option("--filterByOperationIds", "Filters OpenApiDocument by OperationId provided", typeof(string)),
+                new Option("--filterByTags", "Filters OpenApiDocument by Tag(s) provided", typeof(string))
             };
             transformCommand.Handler = CommandHandler.Create<string, FileInfo, OpenApiSpecVersion, OpenApiFormat, string, string, bool, bool>(
                 OpenApiService.ProcessOpenApiDocument);

test/Microsoft.OpenApi.Tests/Services/OpenApiFilterServiceTests.cs

@@ -25,6 +25,7 @@ public OpenApiFilterServiceTests()
         [InlineData("graphService.GetGraphService", null)]
         [InlineData(null, "users.user")]
         [InlineData(null, "applications.application")]
+        [InlineData(null, "reports.Functions")]
         public void ReturnFilteredOpenApiDocumentBasedOnOperationIds(string operationIds, string tags)
         {
             // Act
@@ -47,8 +48,8 @@ public void ReturnFilteredOpenApiDocumentBasedOnOperationIds(string operationIds
         public void ThrowsInvalidOperationExceptionInCreatePredicateWhenInvalidOperationIdIsSpecified()
         {
             // Act and Assert
-            var message = Assert.Throws<InvalidOperationException>(() =>OpenApiFilterService.CreatePredicate(null)).Message;
-            Assert.Equal("OperationId needs to be specified.", message);
+            var message = Assert.Throws<InvalidOperationException>(() =>OpenApiFilterService.CreatePredicate(null, null)).Message;
+            Assert.Equal("Either operationId(s) or tag(s) need to be specified.", message);
         }
     }
 }