fix moderation flow

Author: elliotBraem

backend/src/__tests__/mocks/drizzle.mock.ts

@@ -29,6 +29,7 @@ interface DbInterface {
     name: string;
     description?: string;
   }) => void;
+  getSubmissionByCuratorTweetId: (curatorTweetId: string) => Submission | null;
   getSubmission: (tweetId: string) => Submission | null;
   getDailySubmissionCount: (userId: string) => number;
   saveSubmission: (submission: Submission) => void;
@@ -63,6 +64,7 @@ interface DbInterface {
 // Create mock functions for each database operation
 export const drizzleMock = {
   upsertFeed: mock<DbInterface["upsertFeed"]>(() => {}),
+  getSubmissionByCuratorTweetId: mock<DbInterface["getSubmissionByCuratorTweetId"]>(() => null),
   getSubmission: mock<DbInterface["getSubmission"]>(() => null),
   getDailySubmissionCount: mock<DbInterface["getDailySubmissionCount"]>(
     () => 0,

backend/src/__tests__/submission.service.test.ts

@@ -232,7 +232,7 @@ describe("SubmissionService", () => {
 
     it("should handle moderation responses for pending submissions", async () => {
       // Setup existing submission
-      drizzleMock.getSubmission.mockReturnValue({
+      drizzleMock.getSubmissionByCuratorTweetId.mockReturnValue({
         tweetId: TWEET_IDS.original1_tweet,
         userId: user1.id,
         username: user1.username,
@@ -301,7 +301,7 @@ describe("SubmissionService", () => {
 
     it("should ignore moderation responses from non-moderators", async () => {
       // Setup existing submission
-      drizzleMock.getSubmission.mockReturnValue({
+      drizzleMock.getSubmissionByCuratorTweetId.mockReturnValue({
         tweetId: TWEET_IDS.original1_tweet,
         userId: user1.id,
         username: user1.username,
@@ -419,7 +419,7 @@ describe("SubmissionService", () => {
 
     it("should handle rejection responses", async () => {
       // Setup existing submission
-      drizzleMock.getSubmission.mockReturnValue({
+      drizzleMock.getSubmissionByCuratorTweetId.mockReturnValue({
         tweetId: TWEET_IDS.original1_tweet,
         userId: user1.id,
         username: user1.username,
@@ -616,7 +616,7 @@ describe("SubmissionService", () => {
 
     it("should ignore moderation of already moderated submissions", async () => {
       // Setup existing submission
-      drizzleMock.getSubmission.mockReturnValue({
+      drizzleMock.getSubmissionByCuratorTweetId.mockReturnValue({
         tweetId: TWEET_IDS.original1_tweet,
         userId: user1.id,
         username: user1.username,
@@ -664,7 +664,7 @@ describe("SubmissionService", () => {
 
     it("should use first moderation response when multiple moderators respond", async () => {
       // Setup existing submission
-      drizzleMock.getSubmission.mockReturnValue({
+      drizzleMock.getSubmissionByCuratorTweetId.mockReturnValue({
         tweetId: TWEET_IDS.original1_tweet,
         userId: user1.id,
         username: user1.username,

backend/src/services/db/index.ts

@@ -63,6 +63,10 @@ export class DatabaseService {
     return queries.getSubmission(this.db, tweetId);
   }
 
+  getSubmissionByCuratorTweetId(curatorTweetId: string): TwitterSubmission | null {
+    return queries.getSubmissionByCuratorTweetId(this.db, curatorTweetId);
+  }
+
   getAllSubmissions(): TwitterSubmission[] {
     return queries.getAllSubmissions(this.db);
   }

backend/src/services/db/queries.ts

@@ -170,6 +170,80 @@ export function updateSubmissionFeedStatus(
     );
 }
 
+export function getSubmissionByCuratorTweetId(
+  db: BunSQLiteDatabase,
+  curatorTweetId: string,
+): TwitterSubmission | null {
+  const results = db
+    .select({
+      s: {
+        tweetId: submissions.tweetId,
+        userId: submissions.userId,
+        username: submissions.username,
+        content: submissions.content,
+        curatorNotes: submissions.curatorNotes,
+        curatorId: submissions.curatorId,
+        curatorUsername: submissions.curatorUsername,
+        curatorTweetId: submissions.curatorTweetId,
+        createdAt: submissions.createdAt,
+        submittedAt: sql<string>`COALESCE(${submissions.submittedAt}, ${submissions.createdAt})`,
+      },
+      m: {
+        tweetId: moderationHistory.tweetId,
+        adminId: moderationHistory.adminId,
+        action: moderationHistory.action,
+        note: moderationHistory.note,
+        createdAt: moderationHistory.createdAt,
+        feedId: moderationHistory.feedId,
+        moderationResponseTweetId: submissionFeeds.moderationResponseTweetId,
+      },
+    })
+    .from(submissions)
+    .leftJoin(
+      moderationHistory,
+      eq(submissions.tweetId, moderationHistory.tweetId),
+    )
+    .leftJoin(
+      submissionFeeds,
+      and(
+        eq(submissions.tweetId, submissionFeeds.submissionId),
+        eq(moderationHistory.feedId, submissionFeeds.feedId),
+      ),
+    )
+    .where(eq(submissions.curatorTweetId, curatorTweetId))
+    .orderBy(moderationHistory.createdAt)
+    .all() as DbQueryResult[];
+
+  if (!results.length) return null;
+
+  // Group moderation history
+  const modHistory: Moderation[] = results
+    .filter((r: DbQueryResult) => r.m && r.m.adminId !== null)
+    .map((r: DbQueryResult) => ({
+      tweetId: results[0].s.tweetId,
+      feedId: r.m.feedId!,
+      adminId: r.m.adminId!,
+      action: r.m.action as "approve" | "reject",
+      note: r.m.note,
+      timestamp: new Date(r.m.createdAt!),
+      moderationResponseTweetId: r.m.moderationResponseTweetId ?? undefined,
+    }));
+
+  return {
+    tweetId: results[0].s.tweetId,
+    userId: results[0].s.userId,
+    username: results[0].s.username,
+    content: results[0].s.content,
+    curatorNotes: results[0].s.curatorNotes,
+    curatorId: results[0].s.curatorId,
+    curatorUsername: results[0].s.curatorUsername,
+    curatorTweetId: results[0].s.curatorTweetId,
+    createdAt: results[0].s.createdAt,
+    submittedAt: results[0].s.submittedAt,
+    moderationHistory: modHistory,
+  };
+}
+
 export function getSubmission(
   db: BunSQLiteDatabase,
   tweetId: string,

backend/src/services/submissions/submission.service.ts

@@ -371,11 +371,11 @@ export class SubmissionService {
       return;
     }
 
-    // submission is what we're replying to
-    const inReplyToId = tweet.inReplyToStatusId;
-    if (!inReplyToId) return;
+    // Get the curator's tweet that the moderator is replying to
+    const curatorTweetId = tweet.inReplyToStatusId;
+    if (!curatorTweetId) return;
 
-    const submission = db.getSubmission(inReplyToId);
+    const submission = db.getSubmissionByCuratorTweetId(curatorTweetId);
     if (!submission) {
       logger.error(`${tweet.id}: Received moderation for unsaved submission`);
       return;