feat: update NutritionData model to include unique code and add indexing

Author: WhyAsh5114

apps/svelte/prisma/schema/macros.prisma

@@ -47,12 +47,12 @@ model FoodEntry {
 }
 
 model NutritionData {
-  id           Int         @id @default(autoincrement())
-  code         String
-  product_name String
-  brands       String?
-  quantity     String?
-  foodEntries  FoodEntry[]
+  id            Int                     @id @default(autoincrement())
+  code          String                  @unique
+  product_name  String
+  brands        String?
+  search_vector Unsupported("tsvector") @default(dbgenerated())
+  foodEntries   FoodEntry[]
 
   energy_kcal_100g   Float
   proteins_100g      Float

apps/svelte/src/lib/prisma-idb/idb-interface.ts

@@ -75,6 +75,9 @@ export interface PrismaIDBSchema extends DBSchema {
 	NutritionData: {
 		key: [id: Prisma.NutritionData['id']];
 		value: Prisma.NutritionData;
+		indexes: {
+			codeIndex: [code: Prisma.NutritionData['code']];
+		};
 	};
 	GettingStartedAnswers: {
 		key: [id: Prisma.GettingStartedAnswers['id']];

apps/svelte/src/lib/prisma-idb/prisma-idb-client.ts

@@ -95,7 +95,8 @@ export class PrismaIDBClient {
 					unique: true
 				});
 				db.createObjectStore('FoodEntry', { keyPath: ['id'] });
-				db.createObjectStore('NutritionData', { keyPath: ['id'] });
+				const NutritionDataStore = db.createObjectStore('NutritionData', { keyPath: ['id'] });
+				NutritionDataStore.createIndex('codeIndex', ['code'], { unique: true });
 				const GettingStartedAnswersStore = db.createObjectStore('GettingStartedAnswers', {
 					keyPath: ['id']
 				});
@@ -10801,7 +10802,7 @@ class FoodEntryIDBClass extends BaseIDBModelClass<'FoodEntry'> {
 				const deleteWhere =
 					query.data.nutritionData.delete === true ? {} : query.data.nutritionData.delete;
 				await this.client.nutritionData.delete(
-					{ where: { ...deleteWhere, id: record.nutritionDataId! } },
+					{ where: { ...deleteWhere, id: record.nutritionDataId! } /* TODO: add this > as Prisma.NutritionDataWhereUniqueInput */ },
 					tx
 				);
 				record.nutritionDataId = null;
@@ -11055,7 +11056,7 @@ class NutritionDataIDBClass extends BaseIDBModelClass<'NutritionData'> {
 		return (
 			await Promise.all(
 				records.map(async (record) => {
-					const stringFields = ['code', 'product_name', 'brands', 'quantity'] as const;
+					const stringFields = ['code', 'product_name', 'brands'] as const;
 					for (const field of stringFields) {
 						if (!IDBUtils.whereStringFilter(record, field, whereClause[field])) return null;
 					}
@@ -11150,7 +11151,6 @@ class NutritionDataIDBClass extends BaseIDBModelClass<'NutritionData'> {
 				'code',
 				'product_name',
 				'brands',
-				'quantity',
 				'foodEntries',
 				'energy_kcal_100g',
 				'proteins_100g',
@@ -11265,7 +11265,6 @@ class NutritionDataIDBClass extends BaseIDBModelClass<'NutritionData'> {
 			'code',
 			'product_name',
 			'brands',
-			'quantity',
 			'energy_kcal_100g',
 			'proteins_100g',
 			'fat_100g',
@@ -11317,7 +11316,6 @@ class NutritionDataIDBClass extends BaseIDBModelClass<'NutritionData'> {
 			'code',
 			'product_name',
 			'brands',
-			'quantity',
 			'energy_kcal_100g',
 			'proteins_100g',
 			'fat_100g',
@@ -11375,9 +11373,6 @@ class NutritionDataIDBClass extends BaseIDBModelClass<'NutritionData'> {
 		if (data.brands === undefined) {
 			data.brands = null;
 		}
-		if (data.quantity === undefined) {
-			data.quantity = null;
-		}
 		if (data.saturated_fat_100g === undefined) {
 			data.saturated_fat_100g = null;
 		}
@@ -11707,6 +11702,8 @@ class NutritionDataIDBClass extends BaseIDBModelClass<'NutritionData'> {
 		let record;
 		if (query.where.id !== undefined) {
 			record = await tx.objectStore('NutritionData').get([query.where.id]);
+		} else if (query.where.code !== undefined) {
+			record = await tx.objectStore('NutritionData').index('codeIndex').get([query.where.code]);
 		}
 		if (!record) return null;
 
@@ -11917,7 +11914,7 @@ class NutritionDataIDBClass extends BaseIDBModelClass<'NutritionData'> {
 			throw new Error('Record not found');
 		}
 		const startKeyPath: PrismaIDBSchema['NutritionData']['key'] = [record.id];
-		const stringFields = ['code', 'product_name', 'brands', 'quantity'] as const;
+		const stringFields = ['code', 'product_name', 'brands'] as const;
 		for (const field of stringFields) {
 			IDBUtils.handleStringUpdateField(record, field, query.data[field]);
 		}
@@ -12229,7 +12226,7 @@ class NutritionDataIDBClass extends BaseIDBModelClass<'NutritionData'> {
 					.filter((value) => value !== undefined);
 				(minResult[field as keyof typeof minResult] as number) = Math.min(...values);
 			}
-			const stringFields = ['code', 'product_name', 'brands', 'quantity'] as const;
+			const stringFields = ['code', 'product_name', 'brands'] as const;
 			for (const field of stringFields) {
 				if (!query._min[field]) continue;
 				const values = records
@@ -12287,7 +12284,7 @@ class NutritionDataIDBClass extends BaseIDBModelClass<'NutritionData'> {
 					.filter((value) => value !== undefined);
 				(maxResult[field as keyof typeof maxResult] as number) = Math.max(...values);
 			}
-			const stringFields = ['code', 'product_name', 'brands', 'quantity'] as const;
+			const stringFields = ['code', 'product_name', 'brands'] as const;
 			for (const field of stringFields) {
 				if (!query._max[field]) continue;
 				const values = records

apps/svelte/src/routes/(app)/food-diary/add/manual/+page.server.ts

@@ -6,7 +6,6 @@ export async function load() {
 		code: '2',
 		product_name: 'Filets de poulet blanc x2',
 		brands: 'SoLo',
-		quantity: '240-400 g',
 		energy_kcal_100g: 141,
 		proteins_100g: 30,
 		fat_100g: 2.7,

apps/svelte/src/routes/(app)/food-diary/add/manual/+page.svelte

@@ -16,7 +16,7 @@
 	const nutrimentLabels = getNutrimentLabels(data.sampleNutritionData);
 
 	function getNutrimentLabels(sampleData: NutritionData) {
-		const { code, quantity, product_name, brands, ...nutriments } = sampleData;
+		const { code, product_name, brands, ...nutriments } = sampleData;
 		const { energy_kcal_100g, proteins_100g, carbohydrates_100g, fat_100g, ...others } = nutriments;
 
 		return Object.keys(others).map((key) => capitalizeWords(snakeToNormal(key).slice(0, -4)));

apps/svelte/src/routes/(app)/food-diary/add/scan/+page.svelte

@@ -3,24 +3,31 @@
 	import H2 from '$lib/components/typography/h2.svelte';
 	import H3 from '$lib/components/typography/h3.svelte';
 	import Button from '$lib/components/ui/button/button.svelte';
-	import type { NutritionData } from '@prisma/client';
 	import * as Card from '$lib/components/ui/card/index.js';
 	import { createQuery } from '@tanstack/svelte-query';
 	import { BarqodeStream, type DetectedBarcode } from 'barqode';
-	import { LoaderCircleIcon, PencilIcon, RedoIcon, ScanTextIcon, SearchIcon } from 'lucide-svelte';
+	import {
+		LoaderCircleIcon,
+		PencilIcon,
+		PlusIcon,
+		RedoIcon,
+		ScanTextIcon,
+		SearchIcon
+	} from 'lucide-svelte';
 	import { toast } from 'svelte-sonner';
+	import { getFoodByCode } from '../../food.remote';
 
 	let loading = $state(true);
 	let paused = $state(false);
-	let result = $state<number>();
+	let result = $state<string>();
 
 	function onCameraOn() {
 		loading = false;
 	}
 
 	function onDetect(detectedCodes: DetectedBarcode[]) {
-		const value = Number(detectedCodes.at(-1)?.rawValue);
-		if (isNaN(value)) {
+		const value = detectedCodes.at(-1)?.rawValue;
+		if (typeof value !== 'string') {
 			toast.error('Detected code is not a valid number');
 			return;
 		}
@@ -33,13 +40,11 @@
 		queryKey: ['barcode', result],
 		queryFn: async () => {
 			try {
-				const response = await fetch(`/api/food/${result}`);
-				if (response.ok) return (await response.json()) as NutritionData;
-				else if (response.status === 404) return null;
-				else throw new Error('Error occurred while fetching food data');
+				return await getFoodByCode({ code: result! });
 			} catch (error) {
 				toast.error('Failed to fetch food data');
 				console.error('Error fetching food data:', error);
+				return null;
 			}
 		},
 		enabled: Boolean(result)
@@ -81,13 +86,23 @@
 								<span>Error fetching food data</span>
 							</div>
 						{:else if barcodeQuery.data}
-							<div class="flex flex-col items-center gap-2">
-								<span class="text-lg font-semibold">Food found:</span>
-								<span class="text-xl">{barcodeQuery.data.product_name}</span>
+							<div class="flex flex-col">
+								<span class="text-lg">{barcodeQuery.data.product_name}</span>
 								<span class="text-muted-foreground text-sm">
 									{barcodeQuery.data.brands}
 								</span>
 							</div>
+							<Button class="mt-4 w-full"><PlusIcon /> Add to diary</Button>
+							<Button
+								class="mt-2 w-full"
+								variant="outline"
+								onclick={() => {
+									result = undefined;
+									paused = false;
+								}}
+							>
+								<RedoIcon /> Try again
+							</Button>
 						{:else}
 							<div class="grid gap-2">
 								<span>No food data found for this barcode</span>

apps/svelte/src/routes/(app)/food-diary/food.remote.ts

@@ -11,12 +11,18 @@ function buildPrefixQuery(search: string): string {
 		.join(' & ');
 }
 
-export const getFoodById = command(z.strictObject({ id: z.int() }), async (data) => {
+export const getFoodById = command(z.strictObject({ id: z.number() }), async (data) => {
 	return await prisma.nutritionData.findUniqueOrThrow({
 		where: { id: data.id }
 	});
 });
 
+export const getFoodByCode = command(z.strictObject({ code: z.string() }), async (data) => {
+	return await prisma.nutritionData.findUniqueOrThrow({
+		where: { code: data.code }
+	});
+});
+
 export const searchFoods = query(z.strictObject({ query: z.string() }), async (data) => {
 	const results = await prisma.$queryRawTyped(searchFoodsQuery(buildPrefixQuery(data.query)));