Merge pull request #1407 from CodeWithCJ/dev

Fix for missing user id column in food variant

Author: CodeWithCJ

SparkyFitnessFrontend/package.json

@@ -1,7 +1,7 @@
 {
   "name": "sparkyfitnessfrontend",
   "private": true,
-  "version": "0.16.7",
+  "version": "0.16.8",
   "homepage": "https://github.com/CodeWithCJ/SparkyFitness",
   "type": "module",
   "scripts": {

SparkyFitnessServer/models/food.ts

@@ -27,7 +27,7 @@ const DEFAULT_VARIANT_JSON_SQL = `
     'is_default', fv.is_default,
     'glycemic_index', fv.glycemic_index,
     'custom_nutrients', fv.custom_nutrients,
-    'user_id', fv.user_id,
+    'user_id', f.user_id,
     'source', fv.source,
     'ai_confidence', fv.ai_confidence,
     'allergens', fv.allergens,
@@ -42,11 +42,6 @@ const PREFERRED_DEFAULT_VARIANT_JOIN_SQL = `
     WHERE candidate_fv.food_id = f.id
       AND candidate_fv.is_default = TRUE
     ORDER BY
-      CASE
-        WHEN candidate_fv.user_id = current_user_id() THEN 0
-        WHEN candidate_fv.user_id = f.user_id THEN 1
-        ELSE 2
-      END,
       candidate_fv.updated_at DESC,
       candidate_fv.id
     LIMIT 1
@@ -186,15 +181,14 @@ async function createFood(foodData: any) {
     // 2. Create the primary food variant and mark it as default
     const variantResult = await client.query(
       `INSERT INTO food_variants (
-        food_id, user_id, serving_size, serving_unit, calories, protein, carbs, fat,
+        food_id, serving_size, serving_unit, calories, protein, carbs, fat,
         saturated_fat, polyunsaturated_fat, monounsaturated_fat, trans_fat,
         cholesterol, sodium, potassium, dietary_fiber, sugars,
         vitamin_a, vitamin_c, calcium, iron, is_default, glycemic_index, custom_nutrients,
         source, ai_confidence, allergens, traces, created_at, updated_at
-      ) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18, $19, $20, $21, TRUE, $22, $23, $24, $25, $26, $27, now(), now()) RETURNING id`,
+      ) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18, $19, $20, TRUE, $21, $22, $23, $24, $25, $26, now(), now()) RETURNING id`,
       [
         newFood.id,
-        newFood.user_id,
         sanitizeNumeric(foodData.serving_size),
         foodData.serving_unit,
         sanitizeNumeric(foodData.calories),
@@ -809,19 +803,17 @@ async function createFoodsInBulk(userId: any, foodDataArray: any) {
       for (const variant of food.variants) {
         await client.query(
           `INSERT INTO food_variants (
-              food_id, user_id, serving_size, serving_unit, is_default, calories, protein, carbs, fat,
+              food_id, serving_size, serving_unit, is_default, calories, protein, carbs, fat,
               saturated_fat, polyunsaturated_fat, monounsaturated_fat, trans_fat,
               cholesterol, sodium, potassium, dietary_fiber, sugars,
               vitamin_a, vitamin_c, calcium, iron, glycemic_index, custom_nutrients,
               source, ai_confidence, allergens, traces, created_at, updated_at
             ) VALUES (
               $1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14,
-              $15, $16, $17, $18, $19, $20, $21, $22, $23, $24, $25, $26, $27, now(), now()
+              $15, $16, $17, $18, $19, $20, $21, $22, $23, $24, $25, $26, now(), now()
             )`,
           [
             newFoodId,
-            // @ts-expect-error TS(2571): Object is of type 'unknown'.
-            food.user_id,
             sanitizeNumeric(variant.serving_size),
             variant.serving_unit,
             sanitizeBoolean(variant.is_default) ?? true,

SparkyFitnessServer/models/foodMisc.ts

@@ -25,7 +25,7 @@ const DEFAULT_VARIANT_JSON_SQL = `
     'is_default', fv.is_default,
     'glycemic_index', fv.glycemic_index,
     'custom_nutrients', fv.custom_nutrients,
-    'user_id', fv.user_id,
+    'user_id', f.user_id,
     'source', fv.source,
     'ai_confidence', fv.ai_confidence
   ) AS default_variant
@@ -38,11 +38,6 @@ const PREFERRED_DEFAULT_VARIANT_JOIN_SQL = `
     WHERE candidate_fv.food_id = f.id
       AND candidate_fv.is_default = TRUE
     ORDER BY
-      CASE
-        WHEN candidate_fv.user_id = current_user_id() THEN 0
-        WHEN candidate_fv.user_id = f.user_id THEN 1
-        ELSE 2
-      END,
       candidate_fv.updated_at DESC,
       candidate_fv.id
     LIMIT 1

SparkyFitnessServer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sparkyfitnessserver",
-  "version": "0.16.7",
+  "version": "0.16.8",
   "main": "SparkyFitnessServer.js",
   "type": "module",
   "scripts": {

SparkyFitnessServer/tests/foodDefaultVariantQueries.test.ts

@@ -26,15 +26,13 @@ describe('preferred default variant queries', () => {
     vi.clearAllMocks();
   });
 
-  it('searchFoods prefers a single viewer-specific default variant via lateral join', async () => {
+  it('searchFoods prefers a default variant via lateral join', async () => {
     await searchFoods('yogurt', userId, false, true, false, 10);
 
     const queryStr = mockClient.query.mock.calls[0][0];
     expect(queryStr).toContain('LEFT JOIN LATERAL');
-    expect(queryStr).toContain(
-      'WHEN candidate_fv.user_id = current_user_id() THEN 0'
-    );
-    expect(queryStr).toContain('WHEN candidate_fv.user_id = f.user_id THEN 1');
+    expect(queryStr).toContain('candidate_fv.food_id = f.id');
+    expect(queryStr).toContain('candidate_fv.is_default = TRUE');
     expect(queryStr).not.toContain(
       'LEFT JOIN food_variants fv ON f.id = fv.food_id AND fv.is_default = TRUE'
     );