Filter PR day calc by activity type kind instead of source

PR day calculations now only include core, special, and penalty activities,
excluding bonus-kind activities (mindfulness, skiing, mini-game bonuses,
category leader, etc.) per admin ruling.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: prazgaitis

apps/web/tests/api/mini-games-lifecycle.test.ts

@@ -53,6 +53,7 @@ describe('Mini-Games Lifecycle & Configuration', () => {
       return await ctx.db.insert("activityTypes", {
         challengeId,
         name: 'Running',
+        kind: 'core',
         scoringConfig: { unit: 'minutes', pointsPerUnit: 1, basePoints: 0 },
         contributesToStreak: true,
         isNegative: false,

apps/web/tests/api/mini-games-preview.test.ts

@@ -51,6 +51,7 @@ describe('Mini-Games Preview (Dry Run)', () => {
       return await ctx.db.insert("activityTypes", {
         challengeId,
         name: 'Running',
+        kind: 'core',
         scoringConfig: { unit: 'minutes', pointsPerUnit: 1, basePoints: 0 },
         contributesToStreak: true,
         isNegative: false,

apps/web/tests/api/mini-games.test.ts

@@ -52,6 +52,7 @@ describe('Mini-Games Scoring', () => {
       return await ctx.db.insert("activityTypes", {
         challengeId,
         name: 'Running',
+        kind: 'core',
         scoringConfig: { unit: 'minutes', pointsPerUnit: 1, basePoints: 0 },
         contributesToStreak: true,
         isNegative: false,

packages/backend/lib/activityFilters.ts

@@ -9,3 +9,6 @@ export const USER_ACTIVITY_SOURCES = new Set(["manual", "strava", "apple_health"
 export function isUserLoggedActivity(activity: { source: string }): boolean {
   return USER_ACTIVITY_SOURCES.has(activity.source);
 }
+
+/** Activity type kinds that count toward PR day calculations (real fitness effort). */
+export const PR_ELIGIBLE_KINDS = new Set(["core", "special", "penalty"]);

packages/backend/lib/miniGameCalculations.ts

@@ -6,7 +6,7 @@
  */
 import type { Id } from "../_generated/dataModel";
 import type { QueryCtx } from "../_generated/server";
-import { notDeleted, isUserLoggedActivity } from "./activityFilters";
+import { notDeleted, PR_ELIGIBLE_KINDS } from "./activityFilters";
 import { formatDateOnlyFromUtcMs } from "./dateOnly";
 
 // ─── Types ───────────────────────────────────────────────────────────────────
@@ -419,29 +419,51 @@ export async function previewPrWeekEnd(
 
 // ─── Shared Helpers ──────────────────────────────────────────────────────────
 
+/**
+ * Build a set of activity type IDs whose kind is eligible for PR day calculations.
+ * Only core, special, and penalty activities count — bonus activities (mindfulness,
+ * mini-game bonuses, category leader, skiing, etc.) are excluded.
+ */
+async function getPrEligibleTypeIds(
+  ctx: ReadCtx,
+  challengeId: Id<"challenges">,
+): Promise<Set<Id<"activityTypes">>> {
+  const types = await ctx.db
+    .query("activityTypes")
+    .withIndex("challengeId", (q) => q.eq("challengeId", challengeId))
+    .collect();
+
+  return new Set(
+    types.filter((t) => PR_ELIGIBLE_KINDS.has(t.kind ?? "")).map((t) => t._id),
+  );
+}
+
 /**
  * Get a user's max single-day points total from all days before `beforeDate`.
- * Excludes system-generated bonus activities (mini_game, category_leader, etc.).
+ * Only includes core, special, and penalty activities (excludes bonus kind).
  */
 export async function calculateMaxDailyPoints(
   ctx: ReadCtx,
   userId: Id<"users">,
   challengeId: Id<"challenges">,
   beforeDate: number,
 ): Promise<number> {
-  const activities = await ctx.db
-    .query("activities")
-    .withIndex("by_user_challenge_date", (q) =>
-      q.eq("userId", userId).eq("challengeId", challengeId),
-    )
-    .filter(notDeleted)
-    .collect();
+  const [activities, eligibleTypeIds] = await Promise.all([
+    ctx.db
+      .query("activities")
+      .withIndex("by_user_challenge_date", (q) =>
+        q.eq("userId", userId).eq("challengeId", challengeId),
+      )
+      .filter(notDeleted)
+      .collect(),
+    getPrEligibleTypeIds(ctx, challengeId),
+  ]);
 
   const dailyPoints: Record<string, number> = {};
 
   for (const activity of activities) {
     if (activity.loggedDate >= beforeDate) continue;
-    if (!isUserLoggedActivity(activity)) continue;
+    if (!eligibleTypeIds.has(activity.activityTypeId)) continue;
 
     const dateStr = formatDateOnlyFromUtcMs(activity.loggedDate);
     dailyPoints[dateStr] = (dailyPoints[dateStr] || 0) + activity.pointsEarned;
@@ -452,8 +474,8 @@ export async function calculateMaxDailyPoints(
 }
 
 /**
- * Get total non-bonus points earned by a user during a time period.
- * Excludes system-generated bonus activities to prevent circular scoring.
+ * Get total points earned by a user during a time period.
+ * Only includes core, special, and penalty activities (excludes bonus kind).
  */
 export async function getPointsInPeriod(
   ctx: ReadCtx,
@@ -462,27 +484,30 @@ export async function getPointsInPeriod(
   startDate: number,
   endDate: number,
 ): Promise<number> {
-  const activities = await ctx.db
-    .query("activities")
-    .withIndex("by_user_challenge_date", (q) =>
-      q.eq("userId", userId).eq("challengeId", challengeId),
-    )
-    .filter(notDeleted)
-    .collect();
+  const [activities, eligibleTypeIds] = await Promise.all([
+    ctx.db
+      .query("activities")
+      .withIndex("by_user_challenge_date", (q) =>
+        q.eq("userId", userId).eq("challengeId", challengeId),
+      )
+      .filter(notDeleted)
+      .collect(),
+    getPrEligibleTypeIds(ctx, challengeId),
+  ]);
 
   return activities
     .filter(
       (a) =>
         a.loggedDate >= startDate &&
         a.loggedDate <= endDate &&
-        isUserLoggedActivity(a),
+        eligibleTypeIds.has(a.activityTypeId),
     )
     .reduce((sum, a) => sum + a.pointsEarned, 0);
 }
 
 /**
  * Get the maximum single-day points total during a time period.
- * Excludes system-generated bonus activities (mini_game, category_leader, etc.).
+ * Only includes core, special, and penalty activities (excludes bonus kind).
  */
 export async function getMaxDailyPointsInPeriod(
   ctx: ReadCtx,
@@ -491,21 +516,24 @@ export async function getMaxDailyPointsInPeriod(
   startDate: number,
   endDate: number,
 ): Promise<number> {
-  const activities = await ctx.db
-    .query("activities")
-    .withIndex("by_user_challenge_date", (q) =>
-      q.eq("userId", userId).eq("challengeId", challengeId),
-    )
-    .filter(notDeleted)
-    .collect();
+  const [activities, eligibleTypeIds] = await Promise.all([
+    ctx.db
+      .query("activities")
+      .withIndex("by_user_challenge_date", (q) =>
+        q.eq("userId", userId).eq("challengeId", challengeId),
+      )
+      .filter(notDeleted)
+      .collect(),
+    getPrEligibleTypeIds(ctx, challengeId),
+  ]);
 
   const dailyPoints: Record<string, number> = {};
 
   for (const activity of activities) {
     if (
       activity.loggedDate < startDate ||
       activity.loggedDate > endDate ||
-      !isUserLoggedActivity(activity)
+      !eligibleTypeIds.has(activity.activityTypeId)
     )
       continue;