Add soft delete activities and owner delete UI

Author: prazgaitis

.claude/napkin.md

@@ -18,3 +18,6 @@
 - `page-with-header` CSS class = `pt-16` to offset fixed navbar
 - Seed data lives in `packages/backend/actions/seed.ts`
 - Schema changes auto-deploy locally via `pnpm dev`
+
+## Corrections
+| 2026-02-10 | self | Ran `ls` before reading napkin | Always read `.claude/napkin.md` before any other command |

apps/web/app/challenges/[id]/activities/[activityId]/activity-detail-content.tsx

@@ -2,6 +2,7 @@
 
 import { useState } from 'react';
 import Link from 'next/link';
+import { useRouter } from 'next/navigation';
 import { formatDistanceToNow, format } from 'date-fns';
 import { useMutation, useQuery, usePaginatedQuery } from 'convex/react';
 import { api } from '@repo/backend';
@@ -21,6 +22,7 @@ import {
   Shield,
   ThumbsUp,
   Trophy,
+  Trash2,
 } from 'lucide-react';
 
 import { ConvexError } from 'convex/values';
@@ -88,9 +90,14 @@ export function ActivityDetailContent({
   const [flagSubmitting, setFlagSubmitting] = useState(false);
   const [flagError, setFlagError] = useState<string | null>(null);
   const [flagSuccess, setFlagSuccess] = useState(false);
+  const [showDeleteDialog, setShowDeleteDialog] = useState(false);
+  const [deleteSubmitting, setDeleteSubmitting] = useState(false);
+  const [deleteError, setDeleteError] = useState<string | null>(null);
 
+  const router = useRouter();
   const toggleLike = useMutation(api.mutations.likes.toggle);
   const flagActivity = useMutation(api.mutations.activities.flagActivity);
+  const deleteActivity = useMutation(api.mutations.activities.remove);
 
   const handleToggleLike = async () => {
     setPendingLike(true);
@@ -153,6 +160,20 @@ export function ActivityDetailContent({
     }
   };
 
+  const handleDelete = async () => {
+    setDeleteSubmitting(true);
+    setDeleteError(null);
+    try {
+      await deleteActivity({ activityId: activityId as Id<'activities'> });
+      router.push(`/challenges/${challengeId}/dashboard`);
+    } catch (err) {
+      setDeleteError(
+        err instanceof Error ? err.message : 'Failed to delete activity'
+      );
+      setDeleteSubmitting(false);
+    }
+  };
+
   if (activityData === undefined) {
     return (
       <div className="flex items-center justify-center py-20">
@@ -183,7 +204,19 @@ export function ActivityDetailContent({
     );
   }
 
-  const { activity, user, activityType, challenge, likes, comments, likedByUser, mediaUrls, adminComment, isAdmin } =
+  const {
+    activity,
+    user,
+    activityType,
+    challenge,
+    likes,
+    comments,
+    likedByUser,
+    mediaUrls,
+    adminComment,
+    isAdmin,
+    isOwner,
+  } =
     activityData;
 
   const metrics = activity.metrics as Record<string, unknown> | undefined;
@@ -396,6 +429,18 @@ export function ActivityDetailContent({
                 </Button>
               </DropdownMenuTrigger>
               <DropdownMenuContent align="end">
+                {isOwner && (
+                  <DropdownMenuItem
+                    onClick={() => {
+                      setDeleteError(null);
+                      setShowDeleteDialog(true);
+                    }}
+                    className="text-destructive focus:text-destructive"
+                  >
+                    <Trash2 className="mr-2 h-4 w-4" />
+                    Delete activity
+                  </DropdownMenuItem>
+                )}
                 <DropdownMenuItem
                   onClick={() => {
                     setFlagSuccess(false);
@@ -490,6 +535,48 @@ export function ActivityDetailContent({
                 </DialogFooter>
               </DialogContent>
             </Dialog>
+
+            <Dialog open={showDeleteDialog} onOpenChange={setShowDeleteDialog}>
+              <DialogContent className="sm:max-w-md">
+                <DialogHeader>
+                  <DialogTitle>Delete activity?</DialogTitle>
+                  <DialogDescription>
+                    This removes the activity from your logs and leaderboards. This action
+                    cannot be undone.
+                  </DialogDescription>
+                </DialogHeader>
+                {deleteError && (
+                  <Alert variant="destructive">
+                    <AlertDescription>{deleteError}</AlertDescription>
+                  </Alert>
+                )}
+                <DialogFooter className="flex-col gap-2 sm:flex-row sm:justify-end">
+                  <Button
+                    variant="outline"
+                    className="w-full sm:w-auto"
+                    onClick={() => setShowDeleteDialog(false)}
+                    disabled={deleteSubmitting}
+                  >
+                    Cancel
+                  </Button>
+                  <Button
+                    variant="destructive"
+                    className="w-full sm:w-auto"
+                    onClick={handleDelete}
+                    disabled={deleteSubmitting}
+                  >
+                    {deleteSubmitting ? (
+                      <>
+                        <Loader2 className="mr-2 h-4 w-4 animate-spin" />
+                        Deleting
+                      </>
+                    ) : (
+                      'Delete activity'
+                    )}
+                  </Button>
+                </DialogFooter>
+              </DialogContent>
+            </Dialog>
           </CardFooter>
         </Card>
 

apps/web/tests/api/activities.test.ts

@@ -1179,5 +1179,70 @@ describe('Activities Logic', () => {
       expect(result2.bonusPoints).toBe(25);
       expect(result2.pointsEarned).toBeCloseTo(123.25, 1);
     });
+
+    it('should exclude deleted activities from drink scoring', async () => {
+      const testEmail = "test@example.com";
+      const userId = await createTestUser(t, { email: testEmail });
+      const tWithAuth = t.withIdentity({ subject: "test-user-id", email: testEmail });
+      const challengeId = await createTestChallenge(t, userId);
+
+      await t.run(async (ctx) => {
+        await ctx.db.insert("userChallenges", {
+          userId,
+          challengeId,
+          joinedAt: Date.now(),
+          totalPoints: 0,
+          currentStreak: 0,
+          modifierFactor: 1,
+          paymentStatus: "paid",
+          updatedAt: Date.now(),
+        });
+      });
+
+      const activityTypeId = await t.run(async (ctx) => {
+        return await ctx.db.insert("activityTypes", {
+          challengeId,
+          name: 'Drinks',
+          scoringConfig: {
+            unit: 'drinks',
+            pointsPerUnit: -1,
+            freebiesPerDay: 1,
+          },
+          contributesToStreak: false,
+          isNegative: true,
+          createdAt: Date.now(),
+          updatedAt: Date.now(),
+        });
+      });
+
+      const day = new Date('2024-01-15T12:00:00Z');
+      await t.run(async (ctx) => {
+        await ctx.db.insert("activities", {
+          userId,
+          challengeId,
+          activityTypeId,
+          loggedDate: day.getTime(),
+          metrics: { drinks: 2 },
+          source: "manual",
+          pointsEarned: -2,
+          flagged: false,
+          adminCommentVisibility: "internal",
+          resolutionStatus: "pending",
+          deletedAt: Date.now(),
+          createdAt: Date.now(),
+          updatedAt: Date.now(),
+        });
+      });
+
+      const result = await tWithAuth.mutation(api.mutations.activities.log, {
+        challengeId,
+        activityTypeId,
+        loggedDate: day.toISOString(),
+        metrics: { drinks: 2 },
+        source: "manual",
+      });
+
+      expect(result.pointsEarned).toBe(-1);
+    });
   });
 });

apps/web/tests/api/weekly-leaderboard.test.ts

@@ -89,6 +89,7 @@ describe('getWeeklyCategoryLeaderboard', () => {
     activityTypeId: Id<'activityTypes'>,
     loggedDate: number,
     pointsEarned: number,
+    deletedAt?: number,
   ) => {
     return await t.run(async (ctx) => {
       return await ctx.db.insert('activities', {
@@ -102,6 +103,7 @@ describe('getWeeklyCategoryLeaderboard', () => {
         flagged: false,
         adminCommentVisibility: 'internal',
         resolutionStatus: 'pending',
+        deletedAt,
         createdAt: Date.now(),
         updatedAt: Date.now(),
       });
@@ -219,6 +221,39 @@ describe('getWeeklyCategoryLeaderboard', () => {
     expect(strength!.entries[1].weeklyPoints).toBe(15);
   });
 
+  it('should ignore deleted activities in leaderboard totals', async () => {
+    const { challengeId } = await setupChallenge();
+    const cardioCategory = await createCategory('Cardio');
+    const runningType = await createActivityType(challengeId, 'Running', cardioCategory);
+
+    const alice = await createParticipant(challengeId, 'alice@test.com', 'Alice');
+    const bob = await createParticipant(challengeId, 'bob@test.com', 'Bob');
+
+    await insertActivity(alice, challengeId, runningType, Date.UTC(2024, 0, 2), 30);
+    await insertActivity(
+      alice,
+      challengeId,
+      runningType,
+      Date.UTC(2024, 0, 3),
+      20,
+      Date.now(),
+    );
+    await insertActivity(bob, challengeId, runningType, Date.UTC(2024, 0, 4), 40);
+
+    const result = await t.query(api.queries.participations.getWeeklyCategoryLeaderboard, {
+      challengeId,
+      weekNumber: 1,
+    });
+
+    const cardio = result!.categories.find((c: any) => c.category.name === 'Cardio');
+    expect(cardio).toBeDefined();
+    expect(cardio!.entries).toHaveLength(2);
+    expect(cardio!.entries[0].user.name).toBe('Bob');
+    expect(cardio!.entries[0].weeklyPoints).toBe(40);
+    expect(cardio!.entries[1].user.name).toBe('Alice');
+    expect(cardio!.entries[1].weeklyPoints).toBe(30);
+  });
+
   it('should only include activities from the requested week', async () => {
     const { challengeId } = await setupChallenge();
     const category = await createCategory('Cardio');

packages/backend/_generated/api.d.ts

@@ -20,6 +20,7 @@ import type * as actions_strava from "../actions/strava.js";
 import type * as auth from "../auth.js";
 import type * as http from "../http.js";
 import type * as index from "../index.js";
+import type * as lib_activityFilters from "../lib/activityFilters.js";
 import type * as lib_dateOnly from "../lib/dateOnly.js";
 import type * as lib_defaultEmailPlan from "../lib/defaultEmailPlan.js";
 import type * as lib_emailTemplate from "../lib/emailTemplate.js";
@@ -103,6 +104,7 @@ declare const fullApi: ApiFromModules<{
   auth: typeof auth;
   http: typeof http;
   index: typeof index;
+  "lib/activityFilters": typeof lib_activityFilters;
   "lib/dateOnly": typeof lib_dateOnly;
   "lib/defaultEmailPlan": typeof lib_defaultEmailPlan;
   "lib/emailTemplate": typeof lib_emailTemplate;

packages/backend/lib/activityFilters.ts

@@ -0,0 +1,3 @@
+export const notDeleted = (q: any) => q.eq(q.field("deletedAt"), undefined);
+
+export const isDeleted = (q: any) => q.neq(q.field("deletedAt"), undefined);

packages/backend/lib/scoring.ts

@@ -1,5 +1,6 @@
 import { MutationCtx, QueryCtx } from "../_generated/server";
 import { Id, Doc } from "../_generated/dataModel";
+import { notDeleted } from "./activityFilters";
 
 interface BonusThreshold {
   metric: string;
@@ -73,7 +74,12 @@ async function calculateDrinkPoints(
         .gte("loggedDate", startOfDayUtc)
         .lt("loggedDate", endOfDayUtc)
     )
-    .filter((q) => q.eq(q.field("activityTypeId"), activityType._id))
+    .filter((q) =>
+      q.and(
+        q.eq(q.field("activityTypeId"), activityType._id),
+        notDeleted(q)
+      )
+    )
     .collect();
 
   const existingTotal = existingDrinksLogs.reduce((sum, entry) => {