Handling of OR preposition needs to be reviewed

Author: Microsoft Graph DevX Tooling

tools/TweakOpenApi.ps1

@@ -16,7 +16,7 @@ $prepositionReplacements = @{
     At   = "GraphAPre"
     For  = "GraphFPre"
     Of   = "GraphOPre"
-    Or   = "GraphRPre"
+    #Or   = "GraphRPre" Handling of this preposition needs to be reviewed
 }
 
 $wordReplacements = @{
@@ -33,26 +33,24 @@ Get-ChildItem -Path $OpenAPIFilesPath | ForEach-Object {
     $updatedContent = Get-Content $filePath | ForEach-Object {
         if ($_.contains("operationId:")) {
             $operationId = $_
-            #For the OR preposition, we need to check if the operationId contains 'Org' as it is a reserved word.
-            if (-not($operationId -contains "Org")) {
-                $wordReplacements.Keys | ForEach-Object {
-                    if ($operationId.EndsWith($_, "CurrentCultureIgnoreCase")) {
-                        $operationId = ($operationId -replace $_, $wordReplacements[$_])
-                        $modified = $true
-                        Write-Debug "$_ -> $operationId".Trim()
-                    }
+            $wordReplacements.Keys | ForEach-Object {
+                if ($operationId.EndsWith($_, "CurrentCultureIgnoreCase")) {
+                    $operationId = ($operationId -replace $_, $wordReplacements[$_])
+                    $modified = $true
+                    Write-Debug "$_ -> $operationId".Trim()
                 }
+            }
 
-                if (($targetOperationIdRegex.Match($_)).Success) {
-                    $prepositionReplacements.Keys | ForEach-Object {
-                        # Replace prepositions with replacement word.
-                        #e.g., 'applications_GetCreatedOnBehalfOfByRef' will be renamed to 'applications_GetCreatedOnBehalfGraphOPreGraphBPreRef'.
-                        $operationId = ($operationId -creplace $_, $prepositionReplacements[$_])
-                        $modified = $true
-                        Write-Debug "$_ -> $operationId".Trim()
-                    }
+            if (($targetOperationIdRegex.Match($_)).Success) {
+                $prepositionReplacements.Keys | ForEach-Object {
+                    # Replace prepositions with replacement word.
+                    #e.g., 'applications_GetCreatedOnBehalfOfByRef' will be renamed to 'applications_GetCreatedOnBehalfGraphOPreGraphBPreRef'.
+                    $operationId = ($operationId -creplace $_, $prepositionReplacements[$_])
+                    $modified = $true
+                    Write-Debug "$_ -> $operationId".Trim()
                 }
             }
+            
             return $operationId
         }