musora-content-services 2.131.2 → 2.131.4

package/CHANGELOG.md

@@ -2,6 +2,17 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [2.131.4](https://github.com/railroadmedia/musora-content-services/compare/v2.131.3...v2.131.4) (2026-02-05)
+
+
+### Bug Fixes
+
+* hide badge field if is_active false ([#773](https://github.com/railroadmedia/musora-content-services/issues/773)) ([d8d9159](https://github.com/railroadmedia/musora-content-services/commit/d8d9159c5270dac8ea1de92634266f9f412b3c7c))
+* **onboarding:** update recommended content interface ([65f5e91](https://github.com/railroadmedia/musora-content-services/commit/65f5e91eea00762ea5ab195ce650eb1b3fa92e77))
+* watermelon validation tweaks ([#770](https://github.com/railroadmedia/musora-content-services/issues/770)) ([ebd6e7f](https://github.com/railroadmedia/musora-content-services/commit/ebd6e7f7c059a23a6126b993b3084744d3d6e78a))
+
+### [2.131.3](https://github.com/railroadmedia/musora-content-services/compare/v2.131.2...v2.131.3) (2026-02-04)
+
 ### [2.131.2](https://github.com/railroadmedia/musora-content-services/compare/v2.131.1...v2.131.2) (2026-02-04)
 
 ### [2.131.1](https://github.com/railroadmedia/musora-content-services/compare/v2.131.0...v2.131.1) (2026-02-04)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "musora-content-services",
-  "version": "2.131.2",
+  "version": "2.131.4",
   "description": "A package for Musoras content services ",
   "main": "src/index.js",
   "type": "module",

package/src/contentTypeConfig.js

@@ -1018,24 +1018,30 @@ export const awardTemplate = {
  * @param {string} brand - brand for if content brand is missing
  * @returns {object|object[]} post-processed content
  */
-export function addAwardTemplateToContent(content, brand= null) {
+export function postProcessBadge(content, brand = null) {
   if (!content) return content
 
   // should be fine with this; children don't need awards.
   // assumes if badge_logo exists, it needs a badge_template.
   if (Array.isArray(content)) {
-    content.forEach((item) => {
-      if (item['badge_logo'] && !item['badge_template']) {
-        item['badge_template'] = awardTemplate[item['brand'] || brand].front
-        item['badge_template_rear'] = awardTemplate[item['brand'] || brand].rear
-      }
+    content.map((item) => {
+      return process(item)
     })
   } else {
-    if (content['badge_logo'] && !content['badge_template']) {
-      content['badge_template'] = awardTemplate[content['brand'] || brand].front
-      content['badge_template_rear'] = awardTemplate[content['brand'] || brand].rear
-    }
+    content = process(content)
   }
 
   return content
+
+  function process(item) {
+    if (!item['is_active']) {
+      item['badge'] = null
+      item['badge_rear'] = null
+    }
+    if (item['badge_logo'] && !item['badge_template']) {
+      item['badge_template'] = awardTemplate[item['brand'] || brand].front
+      item['badge_template_rear'] = awardTemplate[item['brand'] || brand].rear
+    }
+    return item
+  }
 }

package/src/services/awards/award-query.js

@@ -223,11 +223,7 @@ function defineAwards(data) {
     return {
       awardId: def._id,
       awardTitle: def.name,
-      badge: def.badge,
-      badge_rear: def.badge_rear,
-      badge_logo: def.logo,
-      badge_template: awardTemplate[def.brand].front,
-      badge_template_rear: awardTemplate[def.brand].rear,
+      ...getBadgeFields(def),
       award: def.award,
       brand: def.brand,
       instructorName: def.instructor_name,
@@ -329,11 +325,7 @@ export async function getCompletedAwards(brand = null, options = {}) {
           awardId: progress.award_id,
           awardTitle: definition.name,
           awardType: definition.type,
-          badge: definition.badge,
-          badge_rear: definition.badge_rear,
-          badge_logo: definition.logo,
-          badge_template: awardTemplate[definition.brand].front,
-          badge_template_rear: awardTemplate[definition.brand].rear,
+          ...getBadgeFields(definition),
           award: definition.award,
           brand: definition.brand,
           hasCertificate: hasCertificate,
@@ -454,11 +446,7 @@ export async function getInProgressAwards(brand = null, options = {}) {
         return {
           awardId: progress.award_id,
           awardTitle: definition.name,
-          badge: definition.badge,
-          badge_rear: definition.badge_rear,
-          badge_logo: definition.logo,
-          badge_template: awardTemplate[definition.brand].front,
-          badge_template_rear: awardTemplate[definition.brand].rear,
+          ...getBadgeFields(definition),
           award: definition.award,
           brand: definition.brand,
           instructorName: definition.instructor_name,
@@ -593,3 +581,13 @@ export async function resetAllAwards() {
     return { deletedCount: 0 }
   }
 }
+
+function getBadgeFields(def) {
+  return {
+    badge: def.is_active ? def.badge : null,
+    badge_rear: def.is_active ? def.badge_rear : null,
+    badge_logo: def.logo,
+    badge_template: awardTemplate[def.brand].front,
+    badge_template_rear: awardTemplate[def.brand].rear,
+  }
+}

package/src/services/progress-row/base.js

@@ -15,7 +15,7 @@ import { addContextToContent } from '../contentAggregator.js'
 import { fetchPlaylist } from '../content-org/playlists.js'
 import { TabResponseType } from '../../contentMetaData.js'
 import { PUT } from '../../infrastructure/http/HttpClient.ts'
-import { addAwardTemplateToContent } from "../../contentTypeConfig.js";
+import { postProcessBadge } from "../../contentTypeConfig.js";
 
 export const USER_PIN_PROGRESS_KEY = 'user_pin_progress_row'
 
@@ -142,7 +142,7 @@ async function popPinnedItem(userPinnedItem, contentCardMap, playlistCards, meth
     } else {
       // we use fetchByRailContentIds so that we don't have the _type restriction in the query
       let data = await fetchByRailContentIds([pinnedId], 'progress-tracker')
-      data = addAwardTemplateToContent(data)
+      data = postProcessBadge(data)
       item = await processContentItem(
         await addContextToContent(() => data[0] ?? null, {
           addNextLesson: true,

package/src/services/progress-row/rows/content-card.js

@@ -5,7 +5,7 @@ import { getAllStartedOrCompleted, getProgressStateByIds } from '../../contentPr
 import { addContextToContent } from '../../contentAggregator.js'
 import { fetchByRailContentIds, fetchShows } from '../../sanity.js'
 import {
-  addAwardTemplateToContent,
+  postProcessBadge,
   awardTemplate,
   collectionLessonTypes,
   getFormattedType,
@@ -46,7 +46,7 @@ export async function getContentCardMap(brand, limit, playlistEngagedOnContent,
       }
     )
     : []
-  contents = addAwardTemplateToContent(contents)
+  contents = postProcessBadge(contents)
 
   const contentCards = await Promise.all(generateContentPromises(contents))
   return contentCards.reduce((contentMap, content) => {

package/src/services/progress-row/rows/playlist-card.js

@@ -4,7 +4,7 @@
 import { fetchUserPlaylists } from '../../content-org/playlists.js'
 import { addContextToContent } from '../../contentAggregator.js'
 import { fetchByRailContentIds } from '../../sanity.js'
-import { addAwardTemplateToContent } from "../../../contentTypeConfig.js";
+import { postProcessBadge } from "../../../contentTypeConfig.js";
 
 export async function getPlaylistCards(recentPlaylists){
   return await Promise.all(
@@ -74,6 +74,6 @@ export async function getPlaylistEngagedOnContent(recentPlaylists){
       addProgressTimestamp: true,
     })
     : []
-  contents = addAwardTemplateToContent(contents)
+  contents = postProcessBadge(contents)
   return contents
 }

package/src/services/sanity.js

@@ -32,7 +32,7 @@ import {
   SONG_TYPES,
   SONG_TYPES_WITH_CHILDREN,
   liveFields,
-  addAwardTemplateToContent,
+  postProcessBadge,
   contentAwardField,
 } from '../contentTypeConfig.js'
 import { fetchSimilarItems } from './recommendations.js'
@@ -998,7 +998,7 @@ export async function fetchLessonContent(railContentId, { addParent = false } =
   }
 
   let contents = await fetchSanity(query, false, { customPostProcess: chapterProcess, processNeedAccess: true })
-  contents = addAwardTemplateToContent(contents)
+  contents = postProcessBadge(contents)
 
   return contents
 }

package/src/services/sync/errors/validators.ts

@@ -1,9 +1,13 @@
 import { SyncValidationError } from './index'
 
+export function throwIfNotInteger(val: any) {
+  if (!Number.isSafeInteger(val)) throw new SyncValidationError('Sync value is not a number: ' + val, typeof val, 'number');
+  return val
+}
 
 export function throwIfNotNumber(val: any) {
   // note: this will accept decimal values
-  if (typeof val !== 'number') throw new SyncValidationError('Sync value is not a number: ' + val, typeof val, 'number');
+  if (!Number.isFinite(val)) throw new SyncValidationError('Sync value is not a number: ' + val, typeof val, 'number');
   return val
 }
 
@@ -17,6 +21,10 @@ export function throwIfNotBoolean(val: any) {
   return val
 }
 
+export function throwIfNotNullableInteger(val: any) {
+  return val === null ? val : throwIfNotInteger(val)
+}
+
 export function throwIfNotNullableNumber(val: any) {
   return val === null ? val : throwIfNotNumber(val)
 }

package/src/services/sync/models/ContentLike.ts

@@ -14,4 +14,9 @@ export default class ContentLike extends BaseModel<{
   set content_id(value: number) {
     this._setRaw('content_id', throwIfNotNumber(value))
   }
+
+  static generateId(contentId: number) {
+    throwIfNotNumber(contentId)
+    return contentId.toString()
+  }
 }

package/src/services/sync/models/ContentProgress.ts

@@ -3,9 +3,11 @@ import { SYNC_TABLES } from '../schema'
 import {
   throwIfInvalidEnumValue,
   throwIfNotNullableNumber,
+  throwIfNotNullableInteger,
   throwIfNotNullableString,
-  throwIfNotNumber,
   throwIfOutsideRange,
+  throwIfNotInteger,
+  throwIfNotNumber
 } from '../errors/validators'
 
 export enum COLLECTION_TYPE {
@@ -19,16 +21,44 @@ export enum STATE {
   COMPLETED = 'completed'
 }
 
-export default class ContentProgress extends BaseModel<{
-  content_id: number
-  content_brand: string | null
-  collection_type: COLLECTION_TYPE
-  collection_id: number
-  state: STATE
-  progress_percent: number
-  resume_time_seconds: number | null
-  last_interacted_a_la_carte: number | null
-}> {
+export interface CollectionParameter {
+  type: COLLECTION_TYPE,
+  id: number,
+}
+
+const validators = {
+  // unsigned int
+  content_id: (contentId: number) => {
+    throwIfNotNullableInteger(contentId)
+    return throwIfOutsideRange(contentId, 0)
+  },
+  content_brand: (contentBrand: string | null) => {
+    return throwIfNotNullableString(contentBrand)
+  },
+  // tinyint unsigned - IMPORTANT: progress percent only moves forward and is clamped between 0 and 100
+  // also has implications for last-write-wins sync strategy
+  progress_percent: (value: number, currentPercent: number) => {
+    throwIfNotNumber(value)
+    throwIfOutsideRange(value, 0, 100)
+    return value === 0 ? 0 : Math.max(value, currentPercent)
+  },
+  // enum collection_type
+  collection_type: (collectionType: string) => {
+    return throwIfInvalidEnumValue(collectionType, COLLECTION_TYPE) as COLLECTION_TYPE
+  },
+  // unsigned mediumint 16777215
+  collection_id: (collectionId: number) => {
+    throwIfNotInteger(collectionId)
+    return throwIfOutsideRange(collectionId, 0, 16777215)
+  },
+  // smallint unsigned
+  resume_time_seconds: (value: number | null) => {
+    throwIfNotNullableNumber(value)
+    return value !== null ? throwIfOutsideRange(value, 0, 65535) : value
+  }
+}
+
+export default class ContentProgress extends BaseModel {
   static table = SYNC_TABLES.CONTENT_PROGRESS
 
   get content_id() {
@@ -57,40 +87,41 @@ export default class ContentProgress extends BaseModel<{
   }
 
   set content_id(value: number) {
-    // unsigned int
-    throwIfNotNumber(value)
-    this._setRaw('content_id', throwIfOutsideRange(value, 0))
+    this._setRaw('content_id', validators.content_id(value))
   }
   set content_brand(value: string |  null) {
-    this._setRaw('content_brand', throwIfNotNullableString(value))
+    this._setRaw('content_brand', validators.content_brand(value))
   }
-  // IMPORTANT: progress percent only moves forward and is clamped between 0 and 100
-  // also has implications for last-write-wins sync strategy
   set progress_percent(value: number) {
-    // tinyint unsigned
-    throwIfNotNumber(value)
-    throwIfOutsideRange(value, 0, 100)
-    const percent = value === 0 ? 0 : Math.max(value, this.progress_percent)
+    const percent = validators.progress_percent(value, this.progress_percent)
 
     this._setRaw('progress_percent', percent)
     this._setRaw('state', percent === 100 ? STATE.COMPLETED : STATE.STARTED)
   }
   set collection_type(value: COLLECTION_TYPE) {
-    // enum collection_type
-    this._setRaw('collection_type', throwIfInvalidEnumValue(value, COLLECTION_TYPE))
+    this._setRaw('collection_type', validators.collection_type(value))
   }
   set collection_id(value: number) {
-    // unsigned mediumint 16777215
-    throwIfNotNumber(value)
-    this._setRaw('collection_id', throwIfOutsideRange(value, 0, 16777215))
+    this._setRaw('collection_id', validators.collection_id(value))
   }
   set resume_time_seconds(value: number | null) {
-    // smallint unsigned
-    throwIfNotNullableNumber(value)
-    this._setRaw('resume_time_seconds', value !== null ? throwIfOutsideRange(value, 0, 65535) : value)
+    this._setRaw('resume_time_seconds', validators.resume_time_seconds(value))
   }
   set last_interacted_a_la_carte(value: number) {
     this._setRaw('last_interacted_a_la_carte', value)
   }
 
+  static generateId(
+    contentId: number,
+    collection: CollectionParameter | null
+  ) {
+    validators.content_id(contentId)
+
+    if (collection !== null) {
+      validators.collection_type(collection.type)
+      validators.collection_id(collection.id)
+    }
+
+    return `${contentId}:${collection?.type || COLLECTION_TYPE.SELF}:${collection?.id || COLLECTION_ID_SELF}`
+  }
 }

package/src/services/sync/models/Practice.ts

@@ -10,6 +10,50 @@ import {
   throwIfOutsideRange,
 } from '../errors/validators'
 
+export const validators = {
+  // char(26)
+  manual_id: (value: string | null) => {
+    throwIfNotNullableString(value)
+    return value !== null ? throwIfMaxLengthExceeded(value, 26) : value
+  },
+  // int unsigned
+  content_id: (value: number | null) => {
+    throwIfNotNullableNumber(value)
+    return value !== null ? throwIfOutsideRange(value, 0) : value
+  },
+  date: (value: string) => {
+    return throwIfNotString(value)
+  },
+  // tinyint(1)
+  auto: (value: boolean) => {
+    return throwIfNotBoolean(value)
+  },
+  duration_seconds: (value: number) => {
+    throwIfNotNumber(value)
+    return throwIfOutsideRange(value, 0, 59999)
+  },
+  // varchar(64)
+  title: (value: string | null) => {
+    throwIfNotNullableString(value)
+    return value !== null ? throwIfMaxLengthExceeded(value, 64) : value
+  },
+  // varchar(255)
+  thumbnail_url: (value: string | null) => {
+    throwIfNotNullableString(value)
+    return value !== null ? throwIfMaxLengthExceeded(value, 255) : value
+  },
+  // tinyint unsigned
+  category_id: (value: number | null) => {
+    throwIfNotNullableNumber(value)
+    return value !== null ? throwIfOutsideRange(value, 0, 255) : value
+  },
+  // tinyint unsigned
+  instrument_id: (value: number | null) => {
+    throwIfNotNullableNumber(value)
+    return value !== null ? throwIfOutsideRange(value, 0, 255) : value
+  }
+}
+
 export default class Practice extends BaseModel<{
   manual_id: string | null
   content_id: number | null
@@ -52,44 +96,41 @@ export default class Practice extends BaseModel<{
   }
 
   set manual_id(value: string | null) {
-    // char(26)
-    throwIfNotNullableString(value)
-    this._setRaw('manual_id', value !== null ? throwIfMaxLengthExceeded(value, 26) : value)
+    this._setRaw('manual_id', validators.manual_id(value))
   }
   set content_id(value: number | null) {
-    // int unsigned
-    throwIfNotNullableNumber(value)
-    this._setRaw('content_id', value !== null ? throwIfOutsideRange(value, 0) : value)
+    this._setRaw('content_id', validators.content_id(value))
   }
   set date(value: string) {
-    this._setRaw('date', throwIfNotString(value))
+    this._setRaw('date', validators.date(value))
   }
   set auto(value: boolean) {
-    // tinyint(1)
-    this._setRaw('auto', throwIfNotBoolean(value))
+    this._setRaw('auto', validators.auto(value))
   }
   set duration_seconds(value: number) {
-    throwIfNotNumber(value)
-    this._setRaw('duration_seconds', throwIfOutsideRange(value, 0, 59999))
+    this._setRaw('duration_seconds', validators.duration_seconds(value))
   }
   set title(value: string | null) {
-    // varchar(64)
-    throwIfNotNullableString(value)
-    this._setRaw('title', value !== null ? throwIfMaxLengthExceeded(value, 64) : value)
+    this._setRaw('title', validators.title(value))
   }
   set thumbnail_url(value: string | null) {
-    // varchar(255)
-    throwIfNotNullableString(value)
-    this._setRaw('thumbnail_url', value !== null ? throwIfMaxLengthExceeded(value, 255) : value)
+    this._setRaw('thumbnail_url', validators.thumbnail_url(value))
   }
   set category_id(value: number | null) {
-    // tinyint unsigned
-    throwIfNotNullableNumber(value)
-    this._setRaw('category_id', value !== null ? throwIfOutsideRange(value, 0, 255) : value)
+    this._setRaw('category_id', validators.category_id(value))
   }
   set instrument_id(value: number | null) {
-    // tinyint unsigned
-    throwIfNotNullableNumber(value)
-    this._setRaw('instrument_id', value !== null ? throwIfOutsideRange(value, 0, 255) : value)
+    this._setRaw('instrument_id', validators.instrument_id(value))
+  }
+
+  static generateAutoId(contentId: number, date: string) {
+    throwIfNotNumber(contentId)
+    throwIfNotString(date)
+    return ['auto', contentId.toString(), date].join(':')
+  }
+
+  static generateManualId(manualId: string) {
+    throwIfNotString(manualId)
+    return `manual:${manualId}`
   }
 }

package/src/services/sync/repositories/content-likes.ts

@@ -3,24 +3,20 @@ import ContentLike from "../models/ContentLike";
 
 export default class LikesRepository extends SyncRepository<ContentLike> {
   async isLiked(contentId: number) {
-    return await this.existOne(LikesRepository.generateId(contentId))
+    return await this.existOne(ContentLike.generateId(contentId))
   }
 
   async areLiked(contentIds: number[]) {
-    return await this.existSome(contentIds.map(LikesRepository.generateId))
+    return await this.existSome(contentIds.map(ContentLike.generateId))
   }
 
   async like(contentId: number) {
-    return await this.upsertOne(LikesRepository.generateId(contentId), r => {
+    return await this.upsertOne(ContentLike.generateId(contentId), r => {
       r.content_id = contentId;
     })
   }
 
   async unlike(contentId: number) {
-    return await this.deleteOne(LikesRepository.generateId(contentId))
-  }
-
-  private static generateId(contentId: number) {
-    return contentId.toString();
+    return await this.deleteOne(ContentLike.generateId(contentId))
   }
 }

package/src/services/sync/repositories/content-progress.ts

@@ -1,5 +1,5 @@
 import SyncRepository, {Q} from './base'
-import ContentProgress, {COLLECTION_ID_SELF, COLLECTION_TYPE, STATE} from '../models/ContentProgress'
+import ContentProgress, {COLLECTION_ID_SELF, COLLECTION_TYPE, STATE, CollectionParameter} from '../models/ContentProgress'
 import {EpochMs} from "../index";
 
 interface ContentIdCollectionTuple {
@@ -7,10 +7,6 @@ interface ContentIdCollectionTuple {
   collection: CollectionParameter | null,
 }
 
-export interface CollectionParameter {
-  type: COLLECTION_TYPE,
-  id: number,
-}
 export default class ProgressRepository extends SyncRepository<ContentProgress> {
   // null collection only
   async startedIds(limit?: number) {
@@ -161,7 +157,7 @@ export default class ProgressRepository extends SyncRepository<ContentProgress>
   }
 
   recordProgress(contentId: number, collection: CollectionParameter | null, progressPct: number, resumeTime?: number, {skipPush = false, fromLearningPath = false} = {}) {
-    const id = ProgressRepository.generateId(contentId, collection)
+    const id = ContentProgress.generateId(contentId, collection)
 
     if (collection?.type === COLLECTION_TYPE.LEARNING_PATH) {
       fromLearningPath = true
@@ -222,7 +218,7 @@ export default class ProgressRepository extends SyncRepository<ContentProgress>
 
     const data = Object.fromEntries(
       Object.entries(contentProgresses).map(([contentId, progressPct]) => [
-        ProgressRepository.generateId(+contentId, collection),
+        ContentProgress.generateId(+contentId, collection),
         (r: ContentProgress) => {
           r.content_id = +contentId
           r.collection_type = collection?.type ?? COLLECTION_TYPE.SELF
@@ -242,11 +238,11 @@ export default class ProgressRepository extends SyncRepository<ContentProgress>
   }
 
   eraseProgress(contentId: number, collection: CollectionParameter | null, {skipPush = false} = {}) {
-    return this.deleteOne(ProgressRepository.generateId(contentId, collection), { skipPush })
+    return this.deleteOne(ContentProgress.generateId(contentId, collection), { skipPush })
   }
 
   eraseProgressMany(contentIds: number[], collection: CollectionParameter | null, {skipPush = false} = {}) {
-    const ids = contentIds.map((id) => ProgressRepository.generateId(id, collection))
+    const ids = contentIds.map((id) => ContentProgress.generateId(id, collection))
     return this.deleteSome(ids, { skipPush })
   }
 
@@ -264,10 +260,4 @@ export default class ProgressRepository extends SyncRepository<ContentProgress>
       )
     )
 
-  private static generateId(
-    contentId: number,
-    collection: CollectionParameter | null
-  ) {
-    return `${contentId}:${collection?.type || COLLECTION_TYPE.SELF}:${collection?.id || COLLECTION_ID_SELF}`
-  }
 }

package/src/services/sync/repositories/practices.ts

@@ -19,8 +19,8 @@ export default class PracticesRepository extends SyncRepository<Practice> {
   }
 
   async trackAutoPractice(contentId: number, date: string, incrementalDurationSeconds: number, skipPush = true) {
-    return await this.upsertOne(PracticesRepository.generateAutoId(contentId, date), r => {
-      r._raw.id = PracticesRepository.generateAutoId(contentId, date);
+    return await this.upsertOne(Practice.generateAutoId(contentId, date), r => {
+      r._raw.id = Practice.generateAutoId(contentId, date);
       r.auto = true;
       r.content_id = contentId;
       r.date = date;
@@ -32,7 +32,7 @@ export default class PracticesRepository extends SyncRepository<Practice> {
   async recordManualPractice(date: string, durationSeconds: number, details: Partial<Pick<Practice, 'title' | 'instrument_id' | 'category_id' | 'thumbnail_url'>> = {}) {
     return await this.insertOne((r) => {
       const manualId = r._raw.id; // yoink watermelon's autogenerated id
-      r._raw.id = PracticesRepository.generateManualId(manualId);
+      r._raw.id = Practice.generateManualId(manualId);
 
       r.manual_id = manualId;
       r.auto = false;
@@ -57,13 +57,6 @@ export default class PracticesRepository extends SyncRepository<Practice> {
     })
   }
 
-  private static generateAutoId(contentId: number, date: string) {
-    return ['auto', contentId.toString(), date].join(':');
-  }
-
-  private static generateManualId(manualId: string) {
-    return `manual:${manualId}`;
-  }
 
   async getAutoPracticesOnDate(date: string) {
     return await this.queryAll(

package/src/services/sync/store/index.ts

@@ -206,23 +206,25 @@ export default class SyncStore<TModel extends BaseModel = BaseModel> {
     return this.queryRecordId(...args)
   }
 
-  async insertOne(builder: (record: TModel) => void, span?: Span) {
+  async insertOne(builder: (record: TModel) => void, parentSpan?: Span) {
     return await this.runScope.abortable(async () => {
-      const record = await this.paranoidWrite(span, async () => {
-        return this.collection.create(rec => {
+      const record = await this.paranoidWrite(parentSpan, async  (writer, span) => {
+        const r = await this.collection.create(rec => {
           builder(rec)
         })
+        span.setAttribute('records.ids', [r.id])
+        return r
       })
       this.emit('upserted', [record])
 
-      this.pushUnsyncedWithRetry(span, { type: 'insertOne', recordId: record.id })
+      this.pushUnsyncedWithRetry(parentSpan, { type: 'insertOne', recordId: record.id })
       await this.ensurePersistence()
 
       return this.modelSerializer.toPlainObject(record)
     })
   }
 
-  async updateOneId(id: RecordId, builder: (record: TModel) => void, span?: Span) {
+  async updateOneId(id: RecordId, builder: (record: TModel) => void, parentSpan?: Span) {
     return await this.runScope.abortable(async () => {
       const found = await this.findRecord(id)
 
@@ -230,59 +232,44 @@ export default class SyncStore<TModel extends BaseModel = BaseModel> {
         throw new SyncError('Record not found', { id })
       }
 
-      const record = await this.paranoidWrite(span, async () => {
+      const record = await this.paranoidWrite(parentSpan, async (_writer, span) => {
+        span.setAttribute('records.ids', [id])
         return found.update(builder)
       })
       this.emit('upserted', [record])
 
-      this.pushUnsyncedWithRetry(span, { type: 'updateOneId', recordId: record.id })
+      this.pushUnsyncedWithRetry(parentSpan, { type: 'updateOneId', recordIds: record.id })
       await this.ensurePersistence()
 
       return this.modelSerializer.toPlainObject(record)
     })
   }
 
-  async upsertSome(builders: Record<RecordId, (record: TModel) => void>, span?: Span, { skipPush = false } = {}) {
+  async upsertSome(builders: Record<RecordId, (record: TModel) => void>, parentSpan?: Span, { skipPush = false } = {}) {
     if (Object.keys(builders).length === 0) return []
 
     return await this.runScope.abortable(async () => {
       const ids = Object.keys(builders)
 
-      const records = await this.paranoidWrite(span, async writer => {
-        const existing = await writer.callReader(() => this.queryMaybeDeletedRecords(Q.where('id', Q.oneOf(ids))))
-        const existingMap = existing.reduce((map, record) => map.set(record.id, record), new Map<RecordId, TModel>())
+      const records = await this.paranoidWrite(parentSpan, async (writer, span) => {
+        span.setAttribute('records.ids', ids)
 
+        const existing = await writer.callReader(() => {
+          return this.queryMaybeDeletedRecords(Q.where('id', Q.oneOf(ids)))
+        })
+        const existingMap = existing.reduce((map, record) => map.set(record.id, record), new Map<RecordId, TModel>())
         const destroyedBuilds = []
-        const recreateBuilds: Array<{ id: RecordId; created_at: EpochMs; builder: (record: TModel) => void }> = []
 
         existing.forEach(record => {
           if (record._raw._status === 'deleted') {
             destroyedBuilds.push(new this.model(this.collection, { id: record.id }).prepareDestroyPermanently())
-          } else if (record._raw._status === 'created' && builders[record.id]) {
-            // Workaround for WatermelonDB bug: prepareUpdate() doesn't commit field changes
-            // for records with _status='created'. Destroy and recreate to ensure updates persist.
-            destroyedBuilds.push(new this.model(this.collection, { id: record.id }).prepareDestroyPermanently())
-            recreateBuilds.push({
-              id: record.id,
-              created_at: record._raw.created_at,
-              builder: builders[record.id]
-            })
           }
         })
 
         const newBuilds = Object.entries(builders).map(([id, builder]) => {
           const existing = existingMap.get(id)
-          const recreate = recreateBuilds.find(r => r.id === id)
 
-          if (recreate) {
-            return this.collection.prepareCreate(record => {
-              record._raw.id = id
-              record._raw.created_at = recreate.created_at as EpochMs
-              record._raw.updated_at = this.generateTimestamp()
-              record._raw._status = 'created'
-              builder(record)
-            })
-          } else if (existing && existing._raw._status !== 'deleted' && existing._raw._status !== 'created') {
+          if (existing && existing._raw._status !== 'deleted') {
             return existing.prepareUpdate(builder)
           } else if (!existing || existing._raw._status === 'deleted') {
             return this.collection.prepareCreate(record => {
@@ -295,7 +282,7 @@ export default class SyncStore<TModel extends BaseModel = BaseModel> {
             })
           }
           return null
-        }).filter((build): build is ReturnType<typeof this.collection.prepareCreate> => build !== null)
+        }).filter(build => build !== null)
 
         await writer.batch(...destroyedBuilds)
         await writer.batch(...newBuilds)
@@ -306,7 +293,7 @@ export default class SyncStore<TModel extends BaseModel = BaseModel> {
       this.emit('upserted', records)
 
       if (!skipPush) {
-        this.pushUnsyncedWithRetry(span, { type: 'upsertSome', recordIds: records.map(r => r.id).join(',') })
+        this.pushUnsyncedWithRetry(parentSpan, { type: 'upsertSome', recordIds: records.map(r => r.id).join(',') })
       }
       await this.ensurePersistence()
 
@@ -329,11 +316,13 @@ export default class SyncStore<TModel extends BaseModel = BaseModel> {
     return this.upsertSomeTentative({ [id]: builder }, span).then(r => r[0])
   }
 
-  async deleteOne(id: RecordId, span?: Span, { skipPush = false } = {}) {
+  async deleteOne(id: RecordId, parentSpan?: Span, { skipPush = false } = {}) {
     return await this.runScope.abortable(async () => {
       let record: TModel | null = null
 
-      await this.paranoidWrite(span, async writer => {
+      await this.paranoidWrite(parentSpan, async (writer, span) => {
+        span.setAttribute('records.ids', [id])
+
         const existing = await writer.callReader(() => this.queryMaybeDeletedRecords(Q.where('id', id))).then(
           (records) => records[0] || null
         )
@@ -355,7 +344,7 @@ export default class SyncStore<TModel extends BaseModel = BaseModel> {
       this.emit('deleted', [id])
 
       if (!skipPush) {
-        this.pushUnsyncedWithRetry(span, { type: 'deleteOne', recordId: id })
+        this.pushUnsyncedWithRetry(parentSpan, { type: 'deleteOne', recordId: id })
       }
       await this.ensurePersistence()
 
@@ -363,9 +352,10 @@ export default class SyncStore<TModel extends BaseModel = BaseModel> {
     })
   }
 
-  async deleteSome(ids: RecordId[], span?: Span, { skipPush = false } = {}) {
+  async deleteSome(ids: RecordId[], parentSpan?: Span, { skipPush = false } = {}) {
     return this.runScope.abortable(async () => {
-      await this.paranoidWrite(span, async writer => {
+      await this.paranoidWrite(parentSpan, async (writer, span) => {
+        span.setAttribute('records.ids', ids)
         const existing = await this.queryRecords(Q.where('id', Q.oneOf(ids)))
 
         await writer.batch(...existing.map(record => record.prepareMarkAsDeleted()))
@@ -374,7 +364,7 @@ export default class SyncStore<TModel extends BaseModel = BaseModel> {
       this.emit('deleted', ids)
 
       if (!skipPush) {
-        this.pushUnsyncedWithRetry(span, { type: 'deleteSome', recordIds: ids.join(',') })
+        this.pushUnsyncedWithRetry(parentSpan, { type: 'deleteSome', recordIds: ids.join(',') })
       }
       await this.ensurePersistence()
 
@@ -386,9 +376,11 @@ export default class SyncStore<TModel extends BaseModel = BaseModel> {
     return this.restoreSome([id], span).then(r => r[0])
   }
 
-  async restoreSome(ids: RecordId[], span?: Span) {
+  async restoreSome(ids: RecordId[], parentSpan?: Span) {
     return this.runScope.abortable(async () => {
-      const records = await this.paranoidWrite(span, async writer => {
+      const records = await this.paranoidWrite(parentSpan, async (writer, span) => {
+        span.setAttribute('records.ids', ids)
+
         const records = await writer.callReader(() => this.queryMaybeDeletedRecords(
           Q.where('id', Q.oneOf(ids)),
           Q.where('_status', 'deleted')
@@ -410,7 +402,7 @@ export default class SyncStore<TModel extends BaseModel = BaseModel> {
 
       this.emit('upserted', records)
 
-      this.pushUnsyncedWithRetry(span, { type: 'restoreSome', recordIds: ids.join(',') })
+      this.pushUnsyncedWithRetry(parentSpan, { type: 'restoreSome', recordIds: ids.join(',') })
       await this.ensurePersistence()
 
       return records.map((record) => this.modelSerializer.toPlainObject(record))
@@ -806,7 +798,7 @@ export default class SyncStore<TModel extends BaseModel = BaseModel> {
    */
   private paranoidWrite<T>(
     parentSpan: Span | undefined,
-    work: (writer: WriterInterface) => Promise<T>
+    work: (writer: WriterInterface, span: Span) => Promise<T>
   ): Promise<T> {
     const initialId = this.userScope.initialId
     const currentId = this.userScope.getCurrentId()
@@ -820,17 +812,7 @@ export default class SyncStore<TModel extends BaseModel = BaseModel> {
     return this.telemetry.trace(
       { name: `write:${this.model.table}`, op: 'write', parentSpan, attributes: { ...this.context.session.toJSON() } },
       (writeSpan) => {
-        return this.db.write(writer =>
-          this.telemetry.trace(
-            {
-              name: `write:generate:${this.model.table}`,
-              op: 'write:generate',
-              parentSpan: writeSpan,
-              attributes: { ...this.context.session.toJSON() },
-            },
-            () => work(writer)
-          )
-        )
+        return this.db.write(writer => work(writer, writeSpan))
       }
     )
   }

package/src/services/sync/telemetry/index.ts

@@ -93,8 +93,7 @@ export class SyncTelemetry {
       op: `${SYNC_TELEMETRY_TRACE_PREFIX}${opts.op}`,
       attributes: {
         ...opts.attributes,
-        'user.initialId': this.userScope.initialId,
-        'user.currentId': this.userScope.getCurrentId(),
+        'user.id': this.userScope.initialId
       },
     }
     return this.Sentry.startSpan<T>(options, (span) => {

package/src/services/sync/telemetry/sampling.ts

@@ -48,8 +48,8 @@ export const createSyncSentryTracesSampler = (sampleRate = 0.1) => {
       return true
     }
 
-    if (attributes?.userId) {
-      return userBucketedSampler(attributes.userId as string | number, sampleRate)
+    if (attributes?.['user.id']) {
+      return userBucketedSampler(attributes['user.id'] as string, sampleRate)
     }
 
     return undefined

package/src/services/user/onboarding.ts

@@ -129,7 +129,7 @@ export interface OnboardingRecommendedContent {
 }
 
 export interface OnboardingRecommendationResponse {
-  recommendation: OnboardingRecommendedContent
+  recommended_content: OnboardingRecommendedContent
   user_onboarding: Onboarding
 }
 

package/src/services/userActivity.js

@@ -8,7 +8,7 @@ import { DataContext, UserActivityVersionKey } from './dataContext.js'
 import { fetchByRailContentIds, fetchParentChildRelationshipsFor } from './sanity'
 import { getMonday, getWeekNumber, isSameDate, isNextDay } from './dateUtils.js'
 import { globalConfig } from './config'
-import { addAwardTemplateToContent, getFormattedType } from '../contentTypeConfig'
+import { postProcessBadge, getFormattedType } from '../contentTypeConfig'
 import dayjs from 'dayjs'
 import { addContextToContent } from './contentAggregator.js'
 import { db, Q } from './sync'
@@ -505,7 +505,7 @@ export async function getRecentActivity({ page = 1, limit = 5, tabName = null }
       addNextLesson: true,
     }
   )
-  contents = addAwardTemplateToContent(contents)
+  contents = postProcessBadge(contents)
 
   contents = await mapContentsThatWereLastProgressedFromMethod(contents)
 
@@ -790,7 +790,7 @@ async function formatPracticeMeta(practices = []) {
       addNextLesson: true,
     }
   )
-  contents = addAwardTemplateToContent(contents)
+  contents = postProcessBadge(contents)
 
   contents = await mapContentsThatWereLastProgressedFromMethod(contents)
 

package/.claude/settings.local.json

@@ -1,9 +0,0 @@
-{
-  "permissions": {
-    "allow": [
-      "Bash(rg:*)",
-      "Bash(npm run lint:*)"
-    ],
-    "deny": []
-  }
-}