Merge branch 'feat/apex-oas' into phale/W-17756721-annotation-params

forcedotcom · Feb 7, 2025 · bbb919b · bbb919b
2 parents 0ce0b3a + 254305a
commit bbb919b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/packages/salesforcedx-vscode-apex/src/commands/apexActionController.ts b/packages/salesforcedx-vscode-apex/src/commands/apexActionController.ts
@@ -84,7 +84,7 @@ export class ApexActionController {
 
           // Step 6: use the strategy to generate the OAS
           const openApiDocument = await promptGenerationOrchestrator.generateOASWithStrategySelectedByBidRule(
-            BidRule.MOST_CALLS
+            BidRule.METHOD_BY_METHOD
           );
 
           // Step 7: Process the OAS document

diff --git a/packages/salesforcedx-vscode-apex/src/oas/promptGenerationOrchestrator.ts b/packages/salesforcedx-vscode-apex/src/oas/promptGenerationOrchestrator.ts
@@ -18,7 +18,8 @@ import {
 
 export enum BidRule {
   LEAST_CALLS,
-  MOST_CALLS
+  MOST_CALLS,
+  METHOD_BY_METHOD
 }
 
 // An orchestrator that coordinates the generation of prompts for Apex classes.
@@ -70,6 +71,8 @@ export class PromptGenerationOrchestrator {
         return this.getLeastCalls(bids);
       case BidRule.MOST_CALLS:
         return this.getMostCalls(bids);
+      case BidRule.METHOD_BY_METHOD:
+        return this.getMethodByMethod(bids);
     }
   }
 
@@ -85,7 +88,8 @@ export class PromptGenerationOrchestrator {
         }
       }
     }
-    return bestStrategy ?? GenerationStrategy.METHOD_BY_METHOD;
+    // TODO: define which to pick when both strategies have same call counts
+    return GenerationStrategy.METHOD_BY_METHOD; // METHOD_BY_METHOD is the default strategy
   }
 
   getMostCalls(bids: Map<GenerationStrategy, PromptGenerationStrategyBid>): GenerationStrategy {
@@ -100,7 +104,11 @@ export class PromptGenerationOrchestrator {
         }
       }
     }
-    return bestStrategy ?? GenerationStrategy.METHOD_BY_METHOD;
+    return GenerationStrategy.METHOD_BY_METHOD;
+  }
+
+  getMethodByMethod(bids: Map<GenerationStrategy, PromptGenerationStrategyBid>): GenerationStrategy {
+    return GenerationStrategy.METHOD_BY_METHOD;
   }
 
   private cleanupYaml(doc: string): string {