wip: in-progress feature work (manual entry, collection view)

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

src/server/services/item.service.ts

@@ -35,6 +35,9 @@ export async function getAllItems(db: Db, userId: number) {
 			)`.as("image_filename"),
 			imageSourceUrl: items.imageSourceUrl,
 			globalItemId: items.globalItemId,
+			brand: sql<
+				string | null
+			>`COALESCE(${globalItems.brand}, ${items.brand})`.as("brand"),
 			createdAt: items.createdAt,
 			updatedAt: items.updatedAt,
 			categoryName: categories.name,
@@ -66,6 +69,7 @@ export async function getItemById(db: Db, userId: number, id: number) {
 				${items.priceCents}
 			)`.as("price_cents"),
 			purchasePriceCents: items.purchasePriceCents,
+			quantity: items.quantity,
 			categoryId: items.categoryId,
 			notes: items.notes,
 			productUrl: items.productUrl,
@@ -75,10 +79,16 @@ export async function getItemById(db: Db, userId: number, id: number) {
 			)`.as("image_filename"),
 			imageSourceUrl: items.imageSourceUrl,
 			globalItemId: items.globalItemId,
+			brand: sql<
+				string | null
+			>`COALESCE(${globalItems.brand}, ${items.brand})`.as("brand"),
 			createdAt: items.createdAt,
 			updatedAt: items.updatedAt,
+			categoryName: categories.name,
+			categoryIcon: categories.icon,
 		})
 		.from(items)
+		.innerJoin(categories, eq(items.categoryId, categories.id))
 		.leftJoin(globalItems, eq(items.globalItemId, globalItems.id))
 		.where(and(eq(items.id, id), eq(items.userId, userId)));
 
@@ -143,6 +153,7 @@ export async function updateItem(
 		imageSourceUrl: string;
 		globalItemId: number;
 		purchasePriceCents: number;
+		brand: string;
 	}>,
 ) {
 	// Check if item exists and belongs to user