@clipin/convex-wearables 0.1.3 → 0.2.0

package/src/component/schema.ts

@@ -200,6 +200,10 @@ export default defineSchema({
   // -------------------------------------------------------------------------
   dailySummaries: defineTable({
     userId: v.string(),
+    provider: v.optional(providerName),
+    dataSourceId: v.optional(v.id("dataSources")),
+    source: v.optional(v.string()),
+    originalSourceName: v.optional(v.string()),
     date: v.string(), // "2026-03-15" (ISO date string)
     category: v.string(), // "activity" | "sleep" | "recovery" | "body"
 
@@ -241,6 +245,8 @@ export default defineSchema({
     bodyBattery: v.optional(v.number()),
     spo2Avg: v.optional(v.number()),
   })
+    .index("by_user_provider_category_date", ["userId", "provider", "category", "date"])
+    .index("by_user_provider_date", ["userId", "provider", "date"])
     .index("by_user_category_date", ["userId", "category", "date"])
     .index("by_user_date", ["userId", "date"]),
 

package/src/component/sdkPush.test.ts

@@ -130,6 +130,20 @@ describe("sdkPush", () => {
         .collect();
     });
     expect(summaries).toHaveLength(2);
+    expect(summaries).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({
+          provider: "google",
+          source: "health-connect",
+          category: "activity",
+        }),
+        expect.objectContaining({
+          provider: "google",
+          source: "health-connect",
+          category: "recovery",
+        }),
+      ]),
+    );
   });
 
   it("deduplicates SDK pushes by external id and source-time keys", async () => {
@@ -304,12 +318,81 @@ describe("sdkPush", () => {
 
     expect(summaries).toHaveLength(1);
     expect(summaries[0]).toMatchObject({
+      provider: "google",
+      source: "health-connect",
       category: "activity",
       totalSteps: 12345,
       totalCalories: 780,
     });
   });
 
+  it("keeps Apple and Google daily summaries separate for the same user date and category", async () => {
+    const t = convexTest(schema, modules);
+
+    await t.action(api.sdkPush.ingestNormalizedPayload, {
+      userId: "user-mixed",
+      provider: "apple",
+      sourceMetadata: {
+        source: "healthkit",
+        originalSourceName: "Apple Watch",
+      },
+      summaries: [
+        {
+          date: "2026-03-18",
+          category: "activity",
+          totalSteps: 9000,
+          activeCalories: 450,
+        },
+      ],
+    });
+
+    await t.action(api.sdkPush.ingestNormalizedPayload, {
+      userId: "user-mixed",
+      provider: "google",
+      sourceMetadata: {
+        source: "health-connect",
+        originalSourceName: "com.google.android.apps.fitness",
+      },
+      summaries: [
+        {
+          date: "2026-03-18",
+          category: "activity",
+          totalSteps: 7200,
+          activeCalories: 330,
+        },
+      ],
+    });
+
+    const summaries = await t.run(async (ctx) => {
+      return await ctx.db
+        .query("dailySummaries")
+        .withIndex("by_user_category_date", (idx) =>
+          idx.eq("userId", "user-mixed").eq("category", "activity").eq("date", "2026-03-18"),
+        )
+        .collect();
+    });
+
+    expect(summaries).toHaveLength(2);
+    expect(summaries).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({
+          provider: "apple",
+          source: "healthkit",
+          originalSourceName: "Apple Watch",
+          totalSteps: 9000,
+          activeCalories: 450,
+        }),
+        expect.objectContaining({
+          provider: "google",
+          source: "health-connect",
+          originalSourceName: "com.google.android.apps.fitness",
+          totalSteps: 7200,
+          activeCalories: 330,
+        }),
+      ]),
+    );
+  });
+
   it("batches large data-point payloads across multiple writes", async () => {
     const t = convexTest(schema, modules);
 

package/src/component/sdkPush.ts

@@ -93,6 +93,8 @@ const sdkDataPointValidator = v.object({
 const sdkSummaryValidator = v.object({
   date: v.string(),
   category: v.string(),
+  source: v.optional(v.string()),
+  originalSourceName: v.optional(v.string()),
   totalSteps: v.optional(v.number()),
   totalCalories: v.optional(v.number()),
   activeCalories: v.optional(v.number()),
@@ -360,7 +362,10 @@ export const ingestNormalizedPayload = action({
     for (const summary of summaries) {
       await ctx.runMutation(internal.summaries.upsert, {
         userId: args.userId,
+        provider: args.provider,
         ...summary,
+        source: summary.source ?? defaultMetadata.source,
+        originalSourceName: summary.originalSourceName ?? defaultMetadata.originalSourceName,
       });
     }
 

package/src/component/summaries.test.ts

@@ -1,5 +1,6 @@
 import { convexTest } from "convex-test";
 import { describe, expect, it } from "vitest";
+import { api, internal } from "./_generated/api";
 import schema from "./schema";
 import { modules } from "./test.setup";
 
@@ -81,6 +82,62 @@ describe("summaries", () => {
       expect(summaries[0].totalSteps).toBe(10000);
       expect(summaries[0].activeMinutes).toBe(45);
     });
+
+    it("upserts summaries by user provider category and date", async () => {
+      const t = convexTest(schema, modules);
+
+      await t.mutation(internal.summaries.upsert, {
+        userId: "user-1",
+        provider: "garmin",
+        date: "2026-03-15",
+        category: "activity",
+        totalSteps: 10000,
+        activeCalories: 600,
+      });
+
+      await t.mutation(internal.summaries.upsert, {
+        userId: "user-1",
+        provider: "apple",
+        date: "2026-03-15",
+        category: "activity",
+        source: "healthkit",
+        originalSourceName: "Apple Watch",
+        totalSteps: 8500,
+        activeCalories: 430,
+      });
+
+      await t.mutation(internal.summaries.upsert, {
+        userId: "user-1",
+        provider: "garmin",
+        date: "2026-03-15",
+        category: "activity",
+        totalSteps: 11000,
+      });
+
+      const summaries = await t.run(async (ctx) => {
+        return await ctx.db
+          .query("dailySummaries")
+          .withIndex("by_user_category_date", (idx) =>
+            idx.eq("userId", "user-1").eq("category", "activity").eq("date", "2026-03-15"),
+          )
+          .collect();
+      });
+
+      expect(summaries).toHaveLength(2);
+      const garmin = summaries.find((summary) => summary.provider === "garmin");
+      const apple = summaries.find((summary) => summary.provider === "apple");
+
+      expect(garmin).toMatchObject({
+        totalSteps: 11000,
+        activeCalories: 600,
+      });
+      expect(apple).toMatchObject({
+        source: "healthkit",
+        originalSourceName: "Apple Watch",
+        totalSteps: 8500,
+        activeCalories: 430,
+      });
+    });
   });
 
   describe("getDailySummaries", () => {
@@ -156,6 +213,48 @@ describe("summaries", () => {
       expect(sleep).toHaveLength(1);
       expect(sleep[0].sleepDurationMinutes).toBe(480);
     });
+
+    it("filters summaries by provider when requested", async () => {
+      const t = convexTest(schema, modules);
+
+      await t.mutation(internal.summaries.upsert, {
+        userId: "user-1",
+        provider: "garmin",
+        date: "2026-03-15",
+        category: "activity",
+        totalSteps: 10000,
+      });
+      await t.mutation(internal.summaries.upsert, {
+        userId: "user-1",
+        provider: "google",
+        date: "2026-03-15",
+        category: "activity",
+        source: "health-connect",
+        totalSteps: 9200,
+      });
+
+      const google = await t.query(api.summaries.getDailySummaries, {
+        userId: "user-1",
+        provider: "google",
+        category: "activity",
+        startDate: "2026-03-15",
+        endDate: "2026-03-15",
+      });
+      const mixed = await t.query(api.summaries.getDailySummaries, {
+        userId: "user-1",
+        category: "activity",
+        startDate: "2026-03-15",
+        endDate: "2026-03-15",
+      });
+
+      expect(google).toHaveLength(1);
+      expect(google[0]).toMatchObject({
+        provider: "google",
+        source: "health-connect",
+        totalSteps: 9200,
+      });
+      expect(mixed).toHaveLength(2);
+    });
   });
 
   describe("getByUserDate", () => {

package/src/component/summaries.ts

@@ -1,5 +1,37 @@
 import { v } from "convex/values";
 import { internalMutation, internalQuery, query } from "./_generated/server";
+import { providerName } from "./schema";
+
+const summaryMetricsValidator = {
+  totalSteps: v.optional(v.number()),
+  totalCalories: v.optional(v.number()),
+  activeCalories: v.optional(v.number()),
+  activeMinutes: v.optional(v.number()),
+  totalDistance: v.optional(v.number()),
+  floorsClimbed: v.optional(v.number()),
+  avgHeartRate: v.optional(v.number()),
+  maxHeartRate: v.optional(v.number()),
+  minHeartRate: v.optional(v.number()),
+  sleepDurationMinutes: v.optional(v.number()),
+  sleepEfficiency: v.optional(v.number()),
+  deepSleepMinutes: v.optional(v.number()),
+  remSleepMinutes: v.optional(v.number()),
+  lightSleepMinutes: v.optional(v.number()),
+  awakeDuringMinutes: v.optional(v.number()),
+  timeInBedMinutes: v.optional(v.number()),
+  hrvAvg: v.optional(v.number()),
+  hrvRmssd: v.optional(v.number()),
+  restingHeartRate: v.optional(v.number()),
+  recoveryScore: v.optional(v.number()),
+  weight: v.optional(v.number()),
+  bodyFatPercentage: v.optional(v.number()),
+  bodyMassIndex: v.optional(v.number()),
+  leanBodyMass: v.optional(v.number()),
+  bodyTemperature: v.optional(v.number()),
+  avgStressLevel: v.optional(v.number()),
+  bodyBattery: v.optional(v.number()),
+  spo2Avg: v.optional(v.number()),
+};
 
 // ---------------------------------------------------------------------------
 // Queries
@@ -7,17 +39,33 @@ import { internalMutation, internalQuery, query } from "./_generated/server";
 
 /**
  * Get daily summaries for a user by category and date range.
- * Returns one document per day — very efficient (365 docs for a full year).
+ * When provider is omitted this returns provider-mixed storage rows and is not
+ * a canonical product view for multi-provider apps.
  */
 export const getDailySummaries = query({
   args: {
     userId: v.string(),
+    provider: v.optional(providerName),
     category: v.string(),
     startDate: v.string(), // "2026-03-01"
     endDate: v.string(), // "2026-03-15"
   },
   returns: v.array(v.any()),
   handler: async (ctx, args) => {
+    if (args.provider !== undefined) {
+      return await ctx.db
+        .query("dailySummaries")
+        .withIndex("by_user_provider_category_date", (idx) =>
+          idx
+            .eq("userId", args.userId)
+            .eq("provider", args.provider)
+            .eq("category", args.category)
+            .gte("date", args.startDate)
+            .lte("date", args.endDate),
+        )
+        .collect();
+    }
+
     return await ctx.db
       .query("dailySummaries")
       .withIndex("by_user_category_date", (idx) =>
@@ -37,10 +85,20 @@ export const getDailySummaries = query({
 export const getByUserDate = internalQuery({
   args: {
     userId: v.string(),
+    provider: v.optional(providerName),
     date: v.string(),
   },
   returns: v.array(v.any()),
   handler: async (ctx, args) => {
+    if (args.provider !== undefined) {
+      return await ctx.db
+        .query("dailySummaries")
+        .withIndex("by_user_provider_date", (idx) =>
+          idx.eq("userId", args.userId).eq("provider", args.provider).eq("date", args.date),
+        )
+        .collect();
+    }
+
     return await ctx.db
       .query("dailySummaries")
       .withIndex("by_user_date", (idx) => idx.eq("userId", args.userId).eq("date", args.date))
@@ -59,68 +117,60 @@ export const getByUserDate = internalQuery({
 export const upsert = internalMutation({
   args: {
     userId: v.string(),
+    provider: providerName,
+    dataSourceId: v.optional(v.id("dataSources")),
+    source: v.optional(v.string()),
+    originalSourceName: v.optional(v.string()),
     date: v.string(),
     category: v.string(),
     // All metric fields are optional — only provided fields are updated
-    totalSteps: v.optional(v.number()),
-    totalCalories: v.optional(v.number()),
-    activeCalories: v.optional(v.number()),
-    activeMinutes: v.optional(v.number()),
-    totalDistance: v.optional(v.number()),
-    floorsClimbed: v.optional(v.number()),
-    avgHeartRate: v.optional(v.number()),
-    maxHeartRate: v.optional(v.number()),
-    minHeartRate: v.optional(v.number()),
-    sleepDurationMinutes: v.optional(v.number()),
-    sleepEfficiency: v.optional(v.number()),
-    deepSleepMinutes: v.optional(v.number()),
-    remSleepMinutes: v.optional(v.number()),
-    lightSleepMinutes: v.optional(v.number()),
-    awakeDuringMinutes: v.optional(v.number()),
-    timeInBedMinutes: v.optional(v.number()),
-    hrvAvg: v.optional(v.number()),
-    hrvRmssd: v.optional(v.number()),
-    restingHeartRate: v.optional(v.number()),
-    recoveryScore: v.optional(v.number()),
-    weight: v.optional(v.number()),
-    bodyFatPercentage: v.optional(v.number()),
-    bodyMassIndex: v.optional(v.number()),
-    leanBodyMass: v.optional(v.number()),
-    bodyTemperature: v.optional(v.number()),
-    avgStressLevel: v.optional(v.number()),
-    bodyBattery: v.optional(v.number()),
-    spo2Avg: v.optional(v.number()),
+    ...summaryMetricsValidator,
   },
   returns: v.id("dailySummaries"),
   handler: async (ctx, args) => {
-    const { userId, date, category, ...metrics } = args;
+    const {
+      userId,
+      provider,
+      dataSourceId,
+      source,
+      originalSourceName,
+      date,
+      category,
+      ...metrics
+    } = args;
 
-    // Find existing summary for this user/date/category
+    // New writes are provider-scoped. Legacy rows without provider remain
+    // readable through unfiltered queries but are not canonical for new ingest.
     const existing = await ctx.db
       .query("dailySummaries")
-      .withIndex("by_user_category_date", (idx) =>
-        idx.eq("userId", userId).eq("category", category).eq("date", date),
+      .withIndex("by_user_provider_category_date", (idx) =>
+        idx.eq("userId", userId).eq("provider", provider).eq("category", category).eq("date", date),
       )
       .first();
 
-    // Filter out undefined values from metrics
-    const definedMetrics: Record<string, number> = {};
-    for (const [key, value] of Object.entries(metrics)) {
+    const definedFields: Record<string, unknown> = {};
+    for (const [key, value] of Object.entries({
+      dataSourceId,
+      source,
+      originalSourceName,
+      ...metrics,
+    })) {
       if (value !== undefined) {
-        definedMetrics[key] = value;
+        definedFields[key] = value;
       }
     }
 
     if (existing) {
-      await ctx.db.patch(existing._id, definedMetrics);
+      await ctx.db.patch(existing._id, definedFields);
       return existing._id;
     }
 
     return await ctx.db.insert("dailySummaries", {
       userId,
+      provider,
       date,
       category,
-      ...definedMetrics,
+      ...definedFields,
     });
   },
 });

package/src/component/syncWorkflow.ts

@@ -501,7 +501,9 @@ export const runConnectionSync = durableWorkflow.define({
           for (const summary of batch.summaries as NormalizedDailySummary[]) {
             await step.runMutation(internal.summaries.upsert, {
               userId: job.userId,
+              provider: job.provider,
               ...summary,
+              source: summary.source ?? job.provider,
             });
           }
           processed += batch.summaries.length;