Cs 10291 create submission card portal

packages/bot-runner/lib/command-runner.ts

@@ -11,16 +11,22 @@ import {
 import { enqueueRunCommandJob } from '@cardstack/runtime-common/jobs/run-command';
 import {
   CreateListingPRHandler,
+  type CreatedListingPRResult,
   type BotTriggerEventContent,
 } from './create-listing-pr-handler';
 import type { GitHubClient } from './github';
 
 const log = logger('bot-runner');
+const CREATE_PR_CARD_COMMAND =
+  '@cardstack/catalog/commands/create-pr-card/default';
+const PATCH_CARD_INSTANCE_COMMAND =
+  '@cardstack/boxel-host/commands/patch-card-instance/default';
 
 export class CommandRunner {
   private createListingPRHandler: CreateListingPRHandler;
 
   constructor(
+    private submissionBotUserId: string,
     private dbAdapter: DBAdapter,
     private queuePublisher: QueuePublisher,
     githubClient: GitHubClient,
@@ -94,12 +100,20 @@ export class CommandRunner {
           eventContent,
           result,
         );
-        await this.createListingPRHandler.openCreateListingPR(
+        let prResult = await this.createListingPRHandler.openCreateListingPR(
           eventContent,
           runAs,
           result,
           submissionCardUrl,
         );
+        if (prResult && submissionCardUrl) {
+          await this.createAndLinkPrCard({
+            runAs,
+            realmURL,
+            submissionCardUrl,
+            prResult,
+          });
+        }
         return result;
       }
 
@@ -145,6 +159,53 @@ export class CommandRunner {
     return await job.done;
   }
 
+  private async createAndLinkPrCard({
+    runAs,
+    realmURL,
+    submissionCardUrl,
+    prResult,
+  }: {
+    runAs: string;
+    realmURL: string;
+    submissionCardUrl: string;
+    prResult: CreatedListingPRResult;
+  }): Promise<void> {
+    let submissionRealm = new URL('/submissions/', realmURL).href;
+    let prCardResult = await this.enqueueRunCommand({
+      runAs: this.submissionBotUserId,
+      realmURL: submissionRealm,
+      command: CREATE_PR_CARD_COMMAND,
+        commandInput: {
+          realm: submissionRealm,
+          prNumber: prResult.prNumber,
+          prUrl: prResult.prUrl,
+          prTitle: prResult.prTitle,
+          branchName: prResult.branchName,
+          prSummary: prResult.summary,
+          submittedBy: runAs,
+        },
+      });
+
+    let prCardUrl = getCardUrl(prCardResult.cardResultString);
+    await this.enqueueRunCommand({
+      runAs,
+      realmURL,
+      command: PATCH_CARD_INSTANCE_COMMAND,
+      commandInput: {
+        cardId: submissionCardUrl,
+        patch: {
+          relationships: {
+            prCard: {
+              links: {
+                self: prCardUrl,
+              },
+            },
+          },
+        },
+      },
+    });
+  }
+
   private async getCommandsForRegistration(
     registrationId: string,
   ): Promise<{ type: string; command: string }[]> {
@@ -168,7 +229,7 @@ export class CommandRunner {
   }
 }
 
-function getSubmissionCardUrl(
+function getCardUrl(
   cardResultString?: string | null,
 ): string | null {
   if (!cardResultString || !cardResultString.trim()) {
@@ -182,3 +243,9 @@ function getSubmissionCardUrl(
     return null;
   }
 }
+
+function getSubmissionCardUrl(
+  cardResultString?: string | null,
+): string | null {
+  return getCardUrl(cardResultString);
+}

packages/bot-runner/lib/create-listing-pr-handler.ts

@@ -5,7 +5,7 @@ import {
 } from '@cardstack/runtime-common';
 import type { BotTriggerContent } from 'https://cardstack.com/base/matrix-event';
 import { createHash } from 'node:crypto';
-import type { GitHubClient } from './github';
+import type { GitHubClient, OpenPullRequestResult } from './github';
 
 const log = logger('bot-runner:create-listing-pr');
 
@@ -24,6 +24,14 @@ interface CreateListingPRContext {
   roomId: string;
 }
 
+export interface CreatedListingPRResult {
+  prNumber: number;
+  prUrl: string;
+  prTitle: string;
+  branchName: string;
+  summary: string | null;
+}
+
 function getCreateListingPRContext(
   eventContent: BotTriggerEventContent,
 ): CreateListingPRContext | null {
@@ -126,15 +134,15 @@ export class CreateListingPRHandler {
     runAs: string,
     runCommandResult?: RunCommandResponse | null,
     submissionCardUrl?: string | null,
-  ): Promise<void> {
+  ): Promise<CreatedListingPRResult | null> {
     let context = getCreateListingPRContext(eventContent);
     if (!context) {
-      return;
+      return null;
     }
     let { owner, repoName, repo, head, title, listingDisplayName } = context;
 
     try {
-      let body = await this.getSubmissionSummary(
+      let summary = await this.getSubmissionSummary(
         eventContent,
         runAs,
         runCommandResult,
@@ -146,7 +154,7 @@ export class CreateListingPRHandler {
         title,
         head,
         base: DEFAULT_BASE_BRANCH,
-        body: body ?? undefined,
+        body: summary ?? undefined,
       };
       let result = await this.githubClient.openPullRequest(prParams);
 
@@ -155,6 +163,7 @@ export class CreateListingPRHandler {
         repo,
         prUrl: result.html_url,
       });
+      return mapOpenPullRequestResult(result, title, head, summary);
     } catch (error) {
       let message = error instanceof Error ? error.message : String(error);
       if (message.includes('No commits between')) {
@@ -165,7 +174,7 @@ export class CreateListingPRHandler {
           listingDisplayName,
           error: message,
         });
-        return;
+        return null;
       }
 
       if (message.includes('A pull request already exists')) {
@@ -175,7 +184,7 @@ export class CreateListingPRHandler {
           head,
           error: message,
         });
-        return;
+        return null;
       }
 
       log.error('failed to open PR from pr-listing-create trigger', {
@@ -226,6 +235,21 @@ export class CreateListingPRHandler {
   }
 }
 
+function mapOpenPullRequestResult(
+  result: OpenPullRequestResult,
+  prTitle: string,
+  branchName: string,
+  summary: string | null,
+): CreatedListingPRResult {
+  return {
+    prNumber: result.number,
+    prUrl: result.html_url,
+    prTitle,
+    branchName,
+    summary,
+  };
+}
+
 async function getContentsFromRealm(cardResultString?: string | null): Promise<{
   files: { path: string; content: string }[];
   hash: string;

packages/bot-runner/lib/timeline-handler.ts

@@ -32,7 +32,12 @@ export function onTimelineEvent({
   githubClient,
   startTime,
 }: TimelineHandlerOptions) {
-  let commandRunner = new CommandRunner(dbAdapter, queuePublisher, githubClient);
+  let commandRunner = new CommandRunner(
+    authUserId,
+    dbAdapter,
+    queuePublisher,
+    githubClient,
+  );
   return async function handleTimelineEvent(
     event: MatrixEvent,
     room: Room | undefined,

packages/bot-runner/tests/bot-runner-test.ts

@@ -311,8 +311,8 @@ module('timeline handler', () => {
 
     assert.strictEqual(
       publishedJobs.length,
-      1,
-      'enqueues run-command job for pr-listing-create',
+      3,
+      'enqueues submission, PR-card, and submission patch run-command jobs for pr-listing-create',
     );
     assert.strictEqual(
       createdBranches.length,